diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-06-13 13:37:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 15:45:07 +0200 |
| commit | 1618ef236bc632e3369289ceb672c4a05c48ed35 (patch) | |
| tree | 7832c7b2f3b54b39ab16172e3a1af96371f21233 /mkspecs/macx-clang-libc++ | |
| parent | 5f9d3867275787e5f9284d78503c0e0d60c2a3b5 (diff) | |
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32
Use these mkspecs to switch to the new libc++ C++ runtime library, which
in turn makes it possible to enable C++11 support with clang.
Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/macx-clang-libc++')
| -rw-r--r-- | mkspecs/macx-clang-libc++/qmake.conf | 21 | ||||
| -rw-r--r-- | mkspecs/macx-clang-libc++/qplatformdefs.h | 43 |
2 files changed, 64 insertions, 0 deletions
diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf new file mode 100644 index 0000000000..aeb0e3bac1 --- /dev/null +++ b/mkspecs/macx-clang-libc++/qmake.conf @@ -0,0 +1,21 @@ +# +# qmake configuration for Clang on OS X +# + +MAKEFILE_GENERATOR = UNIX +TARGET_PLATFORM = macx +TEMPLATE = app +CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +QT += core gui +QMAKE_INCREMENTAL_STYLE = sublib + +include(../common/mac.conf) +include(../common/gcc-base-macx.conf) +include(../common/clang.conf) +include(../common/clang-mac.conf) + +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 new file mode 100644 index 0000000000..a3612d31e1 --- /dev/null +++ b/mkspecs/macx-clang-libc++/qplatformdefs.h @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../common/mac/qplatformdefs.h" + |