diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-05-29 15:07:36 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-15 12:39:52 +0200 |
commit | b460decdfab02c7d57bb673e583185d52cfc464f (patch) | |
tree | 5ffa2dca5f4564ea15afd205577bba0114744009 /mkspecs | |
parent | ab20b499d898bd8cdf12a6a825835de51c63f3ad (diff) |
Remove Mac libc++ mkspecs
Should not be needed anymore (as of 3d0a60aaa4077a8), as we now use libc++
automatically when C++11 support is enabled.
The specs were deprecated in Qt 5.1 (commit f7a7859a7).
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I6653f191b99f7c51c3f02a62c6ef68591b2dfa70
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/macx-clang-libc++-32/qmake.conf | 23 | ||||
-rw-r--r-- | mkspecs/macx-clang-libc++-32/qplatformdefs.h | 43 | ||||
-rw-r--r-- | mkspecs/macx-clang-libc++/qmake.conf | 22 | ||||
-rw-r--r-- | mkspecs/macx-clang-libc++/qplatformdefs.h | 43 |
4 files changed, 0 insertions, 131 deletions
diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf deleted file mode 100644 index 3f7342da0b..0000000000 --- a/mkspecs/macx-clang-libc++-32/qmake.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# qmake configuration for 32-bit Clang on OS X -# - -warning("QMakespec macx-clang-libc++-32 is deprecated. Use macx-clang-32 instead.") - -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname -QMAKE_INCREMENTAL_STYLE = sublib - -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/clang.conf) -include(../common/clang-mac.conf) - -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 - -QMAKE_CFLAGS += -arch i386 -QMAKE_OBJECTIVE_CFLAGS += -arch i386 -stdlib=libc++ -QMAKE_CXXFLAGS += -arch i386 -stdlib=libc++ -QMAKE_LFLAGS += -arch i386 -stdlib=libc++ - -load(qt_config) diff --git a/mkspecs/macx-clang-libc++-32/qplatformdefs.h b/mkspecs/macx-clang-libc++-32/qplatformdefs.h deleted file mode 100644 index 2c3a8b1c09..0000000000 --- a/mkspecs/macx-clang-libc++-32/qplatformdefs.h +++ /dev/null @@ -1,43 +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" - diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf deleted file mode 100644 index 7f4151e81b..0000000000 --- a/mkspecs/macx-clang-libc++/qmake.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# qmake configuration for Clang on OS X -# - -warning("QMakespec macx-clang-libc++ is deprecated. Use macx-clang instead.") - -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname -QMAKE_INCREMENTAL_STYLE = sublib - -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/clang.conf) -include(../common/clang-mac.conf) - -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 - -QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++ -QMAKE_CXXFLAGS += -stdlib=libc++ -QMAKE_LFLAGS += -stdlib=libc++ - -load(qt_config) diff --git a/mkspecs/macx-clang-libc++/qplatformdefs.h b/mkspecs/macx-clang-libc++/qplatformdefs.h deleted file mode 100644 index 2c3a8b1c09..0000000000 --- a/mkspecs/macx-clang-libc++/qplatformdefs.h +++ /dev/null @@ -1,43 +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" - |