Merge #9574: [depends] Fix QT build on OSX
c36ec71
depends: qt: disable printer for all platforms, not just osx (Cory Fields)
This commit is contained in:
commit
5ac668759d
2 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue