diff options
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 11 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_pre.prf | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index d01c25c06d..1dacfedd02 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -1,11 +1,16 @@ defineReplace(qtPlatformTargetSuffix) { + ios:CONFIG(iphonesimulator, iphonesimulator|iphoneos): \ + suffix = _iphonesimulator + else: \ + suffix = + CONFIG(debug, debug|release) { !debug_and_release|build_pass { - mac:return(_debug) - win32:return(d) + mac: return($${suffix}_debug) + win32: return($${suffix}d) } } - return() + return($$suffix) } defineReplace(qtLibraryTarget) { diff --git a/mkspecs/macx-ios-clang/features/default_pre.prf b/mkspecs/macx-ios-clang/features/default_pre.prf index b37f67495c..3501f5eae0 100644 --- a/mkspecs/macx-ios-clang/features/default_pre.prf +++ b/mkspecs/macx-ios-clang/features/default_pre.prf @@ -1,6 +1,10 @@ load(default_pre) +# In case Qt was built for a specific SDK +!iphonesimulator_and_iphoneos:contains(QMAKE_MAC_SDK, ^iphonesimulator.*): \ + CONFIG += iphonesimulator + # Check for supported Xcode versions lessThan(QMAKE_XCODE_VERSION, "4.3"): \ error("This mkspec requires Xcode 4.3 or later") |