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/common/g++-base.conf | |
| 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/common/g++-base.conf')
| -rw-r--r-- | mkspecs/common/g++-base.conf | 3 |
1 files changed, 3 insertions, 0 deletions
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 = |