Skip to content

Commit 5ac6687

Browse files
committed
Merge #9574: [depends] Fix QT build on OSX
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
2 parents 10dc58a + c36ec71 commit 5ac6687

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ $(package)_config_opts += -reduce-exports
7878
$(package)_config_opts += -static
7979
$(package)_config_opts += -silent
8080
$(package)_config_opts += -v
81+
$(package)_config_opts += -no-feature-printer
82+
$(package)_config_opts += -no-feature-printdialog
8183

8284
ifneq ($(build_os),darwin)
8385
$(package)_config_opts_darwin = -xplatform macx-clang-linux

depends/patches/qt/mac-qmake.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
MAKEFILE_GENERATOR = UNIX
22
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname
3-
DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG
43
QMAKE_INCREMENTAL_STYLE = sublib
54
include(../common/macx.conf)
65
include(../common/gcc-base-mac.conf)

0 commit comments

Comments
 (0)