diff options
| author | fanquake <fanquake@gmail.com> | 2020-11-22 11:46:56 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-11-22 14:30:16 +0800 |
| commit | e9a1c9fbdea977edbb4d10d0368cc7c3199bc469 (patch) | |
| tree | b4579cc76c868dba187c16faf639cab0d26738e7 /depends/patches/qt/mac-qmake.conf | |
| parent | 816132e6eb23c06287c1e820cc0990d2317c2f10 (diff) | |
| parent | e1f2553e1148de9bd57818b40b5fe9da7ff5e246 (diff) | |
Merge #19867: build: document and cleanup Qt hacks
e1f2553e1148de9bd57818b40b5fe9da7ff5e246 build: remove global_init_link_order from mac qt qmake.conf (fanquake)
498fa16beabcbba0ef66acd4162e0f77de064268 build: document preprocessing steps in qt package (fanquake)
bd5d9336d9e1c2345d72531adf2027bc4d099d1b build: don't copy Info.plist.* into mkspec for macOS qt build (fanquake)
bfd7e33b4b255c3a5ba14993665e04349c6bdf0a build: remove plugin_no_soname from mac qt qmake.conf (fanquake)
fdde4c7ce624d4dbf72d38e9783c304d70430386 build: pass XCODE_VERSION through to qt macOS cross compile conf (fanquake)
49473ef211343a25658d7c2de17c92e3123ab33b build: convert "echo" usage into a patch in qt package (fanquake)
Pull request description:
Follow up on removing `sed` usage in #19761. Also nice to revisit & cleanup before 5.15.x.
ACKs for top commit:
laanwj:
Code review ACK e1f2553e1148de9bd57818b40b5fe9da7ff5e246
Tree-SHA512: 4e6489d877aaa300f69e091d7117136da49611bd80afd45adfbd7ddeb5b3c9c76fb0f87a3249cbe63ba93129df56281fd4a9389daadc852211325c5ca9ac6567
Diffstat (limited to 'depends/patches/qt/mac-qmake.conf')
| -rw-r--r-- | depends/patches/qt/mac-qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf index 4cd96df29f..0142667547 100644 --- a/depends/patches/qt/mac-qmake.conf +++ b/depends/patches/qt/mac-qmake.conf @@ -1,12 +1,12 @@ MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname +CONFIG += app_bundle incremental lib_version_first absolute_library_soname QMAKE_INCREMENTAL_STYLE = sublib include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) QMAKE_MAC_SDK_PATH=$${MAC_SDK_PATH} -QMAKE_XCODE_VERSION=4.3 +QMAKE_XCODE_VERSION = $${XCODE_VERSION} QMAKE_XCODE_DEVELOPER_PATH=/Developer QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION} QMAKE_MAC_SDK=macosx |