5 files changed, 14 insertions, 16 deletions
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 0cac4c0177..a731cd0cbe 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -40,6 +40,18 @@ macx-xcode {
         }
         QMAKE_BUNDLE_DATA += qmake_launch_screens
     }
+
+    !qtConfig(simulator_and_device) {
+        # Single SDK builds only support the target we built
+        supported_platforms.name = SUPPORTED_PLATFORMS
+        supported_platforms.value = $$QMAKE_MAC_SDK
+        QMAKE_MAC_XCODE_SETTINGS += supported_platforms
+    }
+
+    # In a simulator specific build the device config will set the SDK
+    # to the simulator SDK, but for Xcode we always want the SDKROOT
+    # to be the device SDK.
+    QMAKE_MAC_SDK = $$device.sdk
 }
 
 !xcodebuild:equals(TEMPLATE, app):!isEmpty(QMAKE_INFO_PLIST) {
diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf
index bc72936520..4a7c0820d0 100644
--- a/mkspecs/features/uikit/default_pre.prf
+++ b/mkspecs/features/uikit/default_pre.prf
@@ -7,15 +7,6 @@ $$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
 $$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
     CONFIG += simulator $${simulator.sdk}
 
-$$sim_and_dev {
-    # For a simulator_and_device build all the config tests
-    # are based on the device's ARM SDK, but we know that the simulator
-    # is Intel and that we support SSE/SSE2.
-    QT_CPU_FEATURES.$$QT_ARCH += sse sse2
-    CONFIG += sse sse2
-    DEFINES += QT_COMPILER_SUPPORTS_SSE2
-}
-
 CONFIG += entrypoint
 
 unset(sim_and_dev)
diff --git a/mkspecs/features/uikit/device_destinations.sh b/mkspecs/features/uikit/device_destinations.sh
index 2f291d4186..dbbdc1d005 100755
--- a/mkspecs/features/uikit/device_destinations.sh
+++ b/mkspecs/features/uikit/device_destinations.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright (C) 2016 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 scheme=$1
diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py
index 98498cde29..18855be58e 100755
--- a/mkspecs/features/uikit/devices.py
+++ b/mkspecs/features/uikit/devices.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # Copyright (C) 2017 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 from __future__ import print_function
 
diff --git a/mkspecs/features/uikit/qt_parts.prf b/mkspecs/features/uikit/qt_parts.prf
deleted file mode 100644
index 81814a62b0..0000000000
--- a/mkspecs/features/uikit/qt_parts.prf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# Disable tests for anything but qtbase for now
-!equals(TARGET, qtbase): QT_BUILD_PARTS -= tests
-
-load(qt_parts)