From 7c1bbde476b39841549eb87331d97fe0b76e0178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 11 Sep 2013 15:23:03 +0200 Subject: Move iOS makespec out of unsupported directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's a supported platform from 5.2, and we want build-scripts/CI/etc to adapt to the change as soon as possible. Change-Id: I8c78351191f59a6ecab33acc0829d2535379c787 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Simo Fält --- mkspecs/macx-ios-clang/Info.plist.app | 28 +++++++++++++++ mkspecs/macx-ios-clang/Info.plist.lib | 18 ++++++++++ mkspecs/macx-ios-clang/qmake.conf | 25 +++++++++++++ mkspecs/macx-ios-clang/qplatformdefs.h | 42 ++++++++++++++++++++++ mkspecs/unsupported/macx-ios-clang/Info.plist.app | 28 --------------- mkspecs/unsupported/macx-ios-clang/Info.plist.lib | 18 ---------- mkspecs/unsupported/macx-ios-clang/qmake.conf | 25 ------------- mkspecs/unsupported/macx-ios-clang/qplatformdefs.h | 42 ---------------------- 8 files changed, 113 insertions(+), 113 deletions(-) create mode 100755 mkspecs/macx-ios-clang/Info.plist.app create mode 100644 mkspecs/macx-ios-clang/Info.plist.lib create mode 100644 mkspecs/macx-ios-clang/qmake.conf create mode 100644 mkspecs/macx-ios-clang/qplatformdefs.h delete mode 100755 mkspecs/unsupported/macx-ios-clang/Info.plist.app delete mode 100644 mkspecs/unsupported/macx-ios-clang/Info.plist.lib delete mode 100644 mkspecs/unsupported/macx-ios-clang/qmake.conf delete mode 100644 mkspecs/unsupported/macx-ios-clang/qplatformdefs.h diff --git a/mkspecs/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app new file mode 100755 index 0000000000..91f4b3d07e --- /dev/null +++ b/mkspecs/macx-ios-clang/Info.plist.app @@ -0,0 +1,28 @@ + + + + + CFBundleIconFile + @ICON@ + CFBundlePackageType + APPL + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + @TYPEINFO@ + CFBundleExecutable + @EXECUTABLE@ + CFBundleIdentifier + com.yourcompany.@BUNDLEIDENTIFIER@ + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleName + ${PRODUCT_NAME} + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + NOTE + This file was generated by Qt/QMake. + + diff --git a/mkspecs/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib new file mode 100644 index 0000000000..63f1a945c2 --- /dev/null +++ b/mkspecs/macx-ios-clang/Info.plist.lib @@ -0,0 +1,18 @@ + + + + + CFBundlePackageType + FMWK + CFBundleShortVersionString + @SHORT_VERSION@ + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + @TYPEINFO@ + CFBundleExecutable + @LIBRARY@ + NOTE + Please, do NOT change this file -- It was generated by Qt/QMake. + + diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf new file mode 100644 index 0000000000..ebc07a3d5a --- /dev/null +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -0,0 +1,25 @@ +# +# qmake configuration for macx-ios-clang +# + +MAKEFILE_GENERATOR = UNIX +CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk +QMAKE_INCREMENTAL_STYLE = sublib + +QMAKE_MACOSX_DEPLOYMENT_TARGET = +QMAKE_IOS_DEPLOYMENT_TARGET = 4.3 + +INCLUDEPATH += $$PWD/ios +DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG + +# Universal target (iPhone and iPad) +QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 + +include(../common/ios.conf) +include(../common/gcc-base-mac.conf) +include(../common/clang.conf) +include(../common/clang-mac.conf) +include(../common/ios/clang.conf) +include(../common/ios/qmake.conf) + +load(qt_config) diff --git a/mkspecs/macx-ios-clang/qplatformdefs.h b/mkspecs/macx-ios-clang/qplatformdefs.h new file mode 100644 index 0000000000..c01b619f9a --- /dev/null +++ b/mkspecs/macx-ios-clang/qplatformdefs.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** 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/mac/qplatformdefs.h" diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.app b/mkspecs/unsupported/macx-ios-clang/Info.plist.app deleted file mode 100755 index 91f4b3d07e..0000000000 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.app +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleIconFile - @ICON@ - CFBundlePackageType - APPL - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - @TYPEINFO@ - CFBundleExecutable - @EXECUTABLE@ - CFBundleIdentifier - com.yourcompany.@BUNDLEIDENTIFIER@ - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleName - ${PRODUCT_NAME} - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - NOTE - This file was generated by Qt/QMake. - - diff --git a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib b/mkspecs/unsupported/macx-ios-clang/Info.plist.lib deleted file mode 100644 index 63f1a945c2..0000000000 --- a/mkspecs/unsupported/macx-ios-clang/Info.plist.lib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundlePackageType - FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - @TYPEINFO@ - CFBundleExecutable - @LIBRARY@ - NOTE - Please, do NOT change this file -- It was generated by Qt/QMake. - - diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf deleted file mode 100644 index 3dc2715a5f..0000000000 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ /dev/null @@ -1,25 +0,0 @@ -# -# qmake configuration for macx-ios-clang -# - -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk -QMAKE_INCREMENTAL_STYLE = sublib - -QMAKE_MACOSX_DEPLOYMENT_TARGET = -QMAKE_IOS_DEPLOYMENT_TARGET = 4.3 - -INCLUDEPATH += $$PWD/ios -DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG - -# Universal target (iPhone and iPad) -QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 - -include(../../common/ios.conf) -include(../../common/gcc-base-mac.conf) -include(../../common/clang.conf) -include(../../common/clang-mac.conf) -include(../../common/ios/clang.conf) -include(../../common/ios/qmake.conf) - -load(qt_config) diff --git a/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h b/mkspecs/unsupported/macx-ios-clang/qplatformdefs.h deleted file mode 100644 index 581ad0d485..0000000000 --- a/mkspecs/unsupported/macx-ios-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/mac/qplatformdefs.h" -- cgit v1.2.3