summaryrefslogtreecommitdiffstats
path: root/config.tests/common/c++11
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-05 10:31:49 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-13 16:47:27 +0200
commitf0e2c6fe1c4b89260844243a98862ebe672e3ad9 (patch)
tree86e7d94875aac83d853c0aeb8cac9356cafdc92b /config.tests/common/c++11
parent0abae2aa2b99909b6da4c98b87354a1ba1cd025a (diff)
Add c++11 option to configure.exe
Also check for c++11 support in configure.exe (which is also used by MinGW builds). The c++11 check is therefore moved from 'unix' to 'common' directory. Change-Id: I082848f032c2770e52e34f331b83820f395c06b6 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests/common/c++11')
-rw-r--r--config.tests/common/c++11/c++11.cpp53
-rw-r--r--config.tests/common/c++11/c++11.pro3
2 files changed, 56 insertions, 0 deletions
diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp
new file mode 100644
index 0000000000..671723647e
--- /dev/null
+++ b/config.tests/common/c++11/c++11.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the FOO module 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$
+**
+****************************************************************************/
+
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+// Compiler claims to support C++11, trust it
+#else
+# error "__cplusplus must be >= 201103L, or __GXX_EXPERIMENTAL_CXX0X__ must be defined"
+#endif
+
+#include <utility>
+#if defined(__clang__) && !defined(_LIBCPP_VERSION)
+# error "C++11 with clang requires libc++ runtime"
+#endif
+
+int main(int, char **) { return 0; }
diff --git a/config.tests/common/c++11/c++11.pro b/config.tests/common/c++11/c++11.pro
new file mode 100644
index 0000000000..dd4042b8d6
--- /dev/null
+++ b/config.tests/common/c++11/c++11.pro
@@ -0,0 +1,3 @@
+SOURCES = c++11.cpp
+CONFIG += c++11
+CONFIG -= qt app_bundle