418494ecb6
the code got factored out to an own toolchain.prf file, which is
load()ed from default_pre.prf, so no change at first.
however, on mac, we shadow toolchain.prf, and make it load() sdk.prf
first.
a side effect, it has become harder to disable the use of an sdk
altogether: putting CONFIG-=sdk into a project file or the qmake
command line has no effect now. instead, it's possible to put it into
.qmake.{conf,cache}.
to make it simpler again, it's conceivable to finally add qmake -pre,
which would allow setting variables before default_pre.prf is executed.
take 2: there was nothing wrong with the original patch, but in 5.8,
CONFIG+=simulator_and_device moved from qconfig.pri to various prf files
that would do it according to the simulator_and_device configure
feature, which would be way too late for the "pulled ahead" sdk.prf
loading. as simulator_and_device is now gone entirely, it is safe to
re-apply this patch (mostly) as-is.
Task-number: QTBUG-56144
Change-Id: I6cf484982eaed8af39f7a539c60f5a087a299914
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
52 lines
2.3 KiB
Plaintext
52 lines
2.3 KiB
Plaintext
CONFIG = asset_catalogs rez $$CONFIG
|
|
load(default_pre)
|
|
|
|
isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
|
|
# Get path of Xcode's Developer directory
|
|
QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
|
|
isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \
|
|
error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")
|
|
|
|
# Make sure Xcode path is valid
|
|
!exists($$QMAKE_XCODE_DEVELOPER_PATH): \
|
|
error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
|
|
|
|
# Make sure Xcode is set up properly
|
|
isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
|
|
error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
|
|
}
|
|
|
|
isEmpty(QMAKE_XCODE_VERSION) {
|
|
# Extract Xcode version using xcodebuild
|
|
xcode_version = $$system("/usr/bin/xcodebuild -version")
|
|
QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
|
|
isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
|
|
unset(xcode_version)
|
|
}
|
|
|
|
isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
|
|
QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist
|
|
exists($$QMAKE_XCODE_PREFERENCES_FILE): \
|
|
QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")
|
|
|
|
!isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \
|
|
cache(QMAKE_TARGET_BUNDLE_PREFIX)
|
|
}
|
|
|
|
QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon
|
|
|
|
# Make the default debug info format for static debug builds
|
|
# DWARF instead of DWARF with dSYM. This cuts down build times
|
|
# for application debug builds significantly, as Xcode doesn't
|
|
# have to pull out all the DWARF info from the Qt static libs
|
|
# and put it into a dSYM file. We don't need that dSYM file in
|
|
# the first place, since the information is available in the
|
|
# object files inside the archives (static libraries).
|
|
macx-xcode:qtConfig(static): \
|
|
QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
|
|
|
|
# This variable is used by the xcode_dynamic_library_suffix
|
|
# feature, which allows Xcode to choose the Qt libraries to link to
|
|
# at build time, depending on the current Xcode SDK and configuration.
|
|
QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
|