diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-26 10:30:36 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-26 10:30:59 +0100 |
| commit | 5ac668759dedb5272aefd33f305ae76c854a5737 (patch) | |
| tree | 204330a13d527827831c52c109ac158d3e4a9f3c | |
| parent | 10dc58a2aa79f0ef98ed27de6f193b9024594d54 (diff) | |
| parent | c36ec715f06d212381e0edfa4344514f1a575701 (diff) | |
| download | bitcoin-5ac668759dedb5272aefd33f305ae76c854a5737.tar.xz | |
Merge #9574: [depends] Fix QT build on OSX
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
| -rw-r--r-- | depends/packages/qt.mk | 2 | ||||
| -rw-r--r-- | depends/patches/qt/mac-qmake.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 383ef2dae6..6e38d1ac6a 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -78,6 +78,8 @@ $(package)_config_opts += -reduce-exports $(package)_config_opts += -static $(package)_config_opts += -silent $(package)_config_opts += -v +$(package)_config_opts += -no-feature-printer +$(package)_config_opts += -no-feature-printdialog ifneq ($(build_os),darwin) $(package)_config_opts_darwin = -xplatform macx-clang-linux diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf index 402e0555b0..f565fe3e75 100644 --- a/depends/patches/qt/mac-qmake.conf +++ b/depends/patches/qt/mac-qmake.conf @@ -1,6 +1,5 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname -DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG QMAKE_INCREMENTAL_STYLE = sublib include(../common/macx.conf) include(../common/gcc-base-mac.conf) |