iOS: Replace device and simulator makespecs with single makespec

And use configure's -sdk argument to choose between the iphoneos and the
iphonesimulator SDK. xcodebuild -showsdks can be used to list the
available SDKs. Passing an SDK without a version postfix implies
the latest version of the SDK.

Change-Id: I881df754d522fc91aaa16ba3e39cf0c37a21a1f1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

5 files changed, 30 insertions, 87 deletions

diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf
new file mode 100644
index 0000000000..8f176f3f83
--- /dev/null
+++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf
@@ -0,0 +1,30 @@
+#
+# qmake configuration for macx-ios-clang
+#
+
+!load(device_config): error("Could not successfully load device configuration.")
+
+isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos
+
+# iOS is considered a variant of MacOS by Apple. We follow this to
+# keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS.
+include(../../common/mac.conf)
+
+include(../../common/gcc-base-ios.conf)
+include(../../common/xcode.conf)
+include(../../common/clang.conf)
+include(../../common/clang-mac.conf)
+
+# Extract Xcode version using xcodebuild
+version_info = $$system("$${QMAKE_XCODE_DEVELOPER_PATH}/usr/bin/xcodebuild -version")
+QMAKE_IOS_XCODE_VERSION = $$member(version_info, 1)
+unset(version_info)
+
+# Version check
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+include(../../common/ios.conf)
+include(../../common/ios/clang.conf)
+include(../../common/ios/qmake.conf)
+
+load(qt_config)
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h b/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h
index 5f80a17860..5f80a17860 100644
--- a/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h
+++ b/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
deleted file mode 100644
index 3e1a669905..0000000000
--- a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# qmake configuration for ios-device-clang
-#
-
-QMAKE_IOS_DEVICE_TYPE = iPhoneOS
-
-# Samsung S5PC100, Apple A4, A5, A5X
-QMAKE_IOS_TARGET_ARCH = armv7
-
-# FIXME: Add armv7s (A6) support when we need it
-
-include(../../common/mac.conf)
-include(../../common/gcc-base-ios.conf)
-include(../../common/clang.conf)
-include(../../common/clang-mac.conf)
-include(../../common/ios.conf)
-include(../../common/ios/versions.conf)
-include(../../common/ios/clang.conf)
-include(../../common/ios/qmake.conf)
-include(../../common/ios/arch.conf)
-
-load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf
deleted file mode 100644
index a8072fed00..0000000000
--- a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# qmake configuration for ios-simulator-clang
-#
-
-QMAKE_IOS_DEVICE_TYPE = iPhoneSimulator
-
-# Simulator is i386 only
-QMAKE_IOS_TARGET_ARCH = i386
-
-QMAKE_IOS_CFLAGS += -fexceptions -fasm-blocks
-QMAKE_IOS_OBJ_CFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch
-
-include(../../common/mac.conf)
-include(../../common/gcc-base-ios.conf)
-include(../../common/clang.conf)
-include(../../common/clang-mac.conf)
-include(../../common/ios.conf)
-include(../../common/ios/versions.conf)
-include(../../common/ios/clang.conf)
-include(../../common/ios/qmake.conf)
-include(../../common/ios/arch.conf)
-
-load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h
deleted file mode 100644
index 5f80a17860..0000000000
--- a/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../common/ios/qplatformdefs.h"