From c3278e33534fe937fe367dfbf648282ceba68c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 20 Nov 2012 15:25:34 +0100 Subject: 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 --- .../unsupported/macx-iosdevice-clang/qmake.conf | 22 ------------ .../macx-iosdevice-clang/qplatformdefs.h | 42 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 mkspecs/unsupported/macx-iosdevice-clang/qmake.conf delete mode 100644 mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h (limited to 'mkspecs/unsupported/macx-iosdevice-clang') 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-iosdevice-clang/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h deleted file mode 100644 index 5f80a17860..0000000000 --- a/mkspecs/unsupported/macx-iosdevice-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" -- cgit v1.2.3