diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
| commit | 17198e03ab36e5f579a1477b09cc3e601975eb5f (patch) | |
| tree | 61ba826e9edd53469abdc1e1f58b1223d0336c56 /mkspecs/features/uikit/sdk.prf | |
| parent | a5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff) | |
| parent | 2e2b32a9ab459f6618d02e4b454c75a787172def (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/corelib/global/qglobal.cpp
src/corelib/tools/qstring.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/platforms/eglfs/api/qeglfsglobal.h
Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'mkspecs/features/uikit/sdk.prf')
| -rw-r--r-- | mkspecs/features/uikit/sdk.prf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index 94451ea196..0ec065e35d 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -12,9 +12,6 @@ build_pass:simulator: \ load(sdk) -lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \ - error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.") - macx-xcode { sdk_path_device.name = "QMAKE_MAC_SDK_PATH[sdk=$${device.sdk}*]" sdk_path_device.value = $$xcodeSDKInfo(Path, $${device.sdk}) |