diff options
| author | Ken Lee <ken2812221@gmail.com> | 2018-05-19 16:24:37 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-07-05 17:12:52 +0200 |
| commit | 70afa65b175080b617e168be5396fbc180ae8bc5 (patch) | |
| tree | b18f71e9d891a4da312ce42fe5cbf97d162d5086 /depends/packages | |
| parent | 28482efefb15dc2c273a52b96d1aceb995db4968 (diff) | |
Fix depends Qt5.9.4 mac build
Apply patch from QTBUG-67286
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 128f55f6df..e892b6ba41 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -91,6 +91,7 @@ $(package)_config_opts_linux += -fontconfig $(package)_config_opts_linux += -no-opengl $(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host) $(package)_config_opts_i686_linux = -xplatform linux-g++-32 +$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" $(package)_build_env = QT_RCC_TEST=1 endef @@ -128,6 +129,7 @@ define $(package)_preprocess_cmds cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\ + patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\ patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ |