diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-05-29 07:10:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 12:30:13 +0200 |
| commit | bf84d1a1fe1550fb7cb86d686bf0138c1c41e87b (patch) | |
| tree | 83ca6ac60c54ae23592ac1dc96efa39e94f945ba /mkspecs | |
| parent | a6d6719c26a6d8e43250d05e2b587dbcc3e59366 (diff) | |
configure: Auto-detect and enable C++11 support if available
Enabling support for C++11 adds CONFIG+=c++11 to the Qt build. Projects
using Qt can check for C++11 support using contains(QT_CONFIG, c++11) in
their .pr[iof] files.
The QMAKE_CXXFLAGS_CXX11 and QMAKE_LFLAGS_CXX11 qmake varibles contain
any arguments the compiler needs to enable C++11. CONFIG+=c++11 adds
these arguments to the build.
Support for clang, g++, and the Intel C++ Compiler for Linux are
included in this commit.
Change-Id: Id77f86d7ad4d5c740b890446a40b105879a0d327
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/clang.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/g++-base.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/c++11.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_plugin.prf | 1 | ||||
| -rw-r--r-- | mkspecs/linux-icc/qmake.conf | 2 |
6 files changed, 13 insertions, 0 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 069cdfafec..67fdf4c1f4 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -15,3 +15,6 @@ QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_ QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + +QMAKE_CXXFLAGS_CXX11 = -std=c++11 +QMAKE_LFLAGS_CXX11 = diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf index eb5b7d6188..35f86e5bf1 100644 --- a/mkspecs/common/g++-base.conf +++ b/mkspecs/common/g++-base.conf @@ -28,3 +28,6 @@ QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + +QMAKE_CXXFLAGS_CXX11 = -std=c++0x +QMAKE_LFLAGS_CXX11 = diff --git a/mkspecs/features/c++11.prf b/mkspecs/features/c++11.prf new file mode 100644 index 0000000000..4b56fa9fd2 --- /dev/null +++ b/mkspecs/features/c++11.prf @@ -0,0 +1,3 @@ +QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_CXX11 +QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_CXX11 +QMAKE_LFLAGS += $$QMAKE_LFLAGS_CXX11 diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 217572e143..b6b0c2ca37 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -50,6 +50,7 @@ contains(QT_CONFIG, largefile):CONFIG += largefile contains(QT_CONFIG, build_all):CONFIG += build_all contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy +contains(QT_CONFIG, c++11):CONFIG += c++11 #mac frameworks mac:!static:contains(QT_CONFIG, qt_framework) { diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index a63ffab868..768918f65b 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -11,6 +11,7 @@ TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy +contains(QT_CONFIG, c++11):CONFIG += c++11 load(qt_targets) diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 4884ea1d1f..eb837254e1 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -35,6 +35,7 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +QMAKE_CXXFLAGS_CXX11 = -std=c++0x QMAKE_INCDIR = QMAKE_LIBDIR = @@ -56,6 +57,7 @@ QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,-z,defs QMAKE_LFLAGS_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_CXX11 = QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl |