LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #9574: [depends] Fix QT build on OSX

Browse source 
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2017-01-26 10:30:36 +01:00
commit 5ac668759d
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
depends/packages/qt.mk
View file

@ -78,6 +78,8 @@ $(package)_config_opts += -reduce-exports
$(package)_config_opts += -static $(package)_config_opts += -static
$(package)_config_opts += -silent $(package)_config_opts += -silent
$(package)_config_opts += -v $(package)_config_opts += -v
$(package)_config_opts += -no-feature-printer
$(package)_config_opts += -no-feature-printdialog
ifneq ($(build_os),darwin) ifneq ($(build_os),darwin)
$(package)_config_opts_darwin = -xplatform macx-clang-linux $(package)_config_opts_darwin = -xplatform macx-clang-linux

1
depends/patches/qt/mac-qmake.conf
View file

@ -1,6 +1,5 @@
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname 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 QMAKE_INCREMENTAL_STYLE = sublib
include(../common/macx.conf) include(../common/macx.conf)
include(../common/gcc-base-mac.conf) include(../common/gcc-base-mac.conf)