diff options
| author | Cory Fields <[email protected]> | 2017-01-17 22:37:40 -0500 |
|---|---|---|
| committer | fanquake <[email protected]> | 2017-01-19 15:31:55 +0800 |
| commit | c36ec715f06d212381e0edfa4344514f1a575701 (patch) | |
| tree | 14517fb7295e19a5c8274daa27f4ad7b811f9a14 | |
| parent | Merge #9512: Fix various things -fsanitize complains about (diff) | |
| download | discoin-c36ec715f06d212381e0edfa4344514f1a575701.tar.xz discoin-c36ec715f06d212381e0edfa4344514f1a575701.zip | |
depends: qt: disable printer for all platforms, not just osx
This also fixes the native osx build.
| -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 383ef2dae..6e38d1ac6 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 402e0555b..f565fe3e7 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) |