diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-03-05 08:45:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-03-05 12:21:06 +0100 |
| commit | 23e6a0ac0936c280e70d3f71074eedfe163a205e (patch) | |
| tree | e73124bb5ba7c3754ba1d948894ca753d2258057 /qtcreator.pri | |
| parent | 3ba9db48edcf13643fe744ffa4a46a4e03ab4990 (diff) | |
| download | qt-creator-23e6a0ac0936c280e70d3f71074eedfe163a205e.tar.gz | |
Make C++11 unconditional
Change-Id: I88d6f99a1fa714386337589e1edda66b66091151
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index c39e8a06a2..a5654f5aa7 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -5,8 +5,24 @@ QTCREATOR_VERSION = 3.1.81 QTCREATOR_COMPAT_VERSION = 3.1.81 BINARY_ARTIFACTS_BRANCH = master -# enable c++11 on everything but mac/release (breaks 10.6) -!macx|CONFIG(debug, debug|release): CONFIG += c++11 +# enable c++11 +isEqual(QT_MAJOR_VERSION, 5) { + CONFIG += c++11 +} else { + macx { + !macx-clang-libc++: error("You need to use the macx-clang-libc++ mkspec to compile Qt Creator (call qmake with '-spec unsupported/macx-clang-libc++')") + } else:linux-g++* { + QMAKE_CXXFLAGS += -std=c++0x + } else:linux-icc* { + QMAKE_CXXFLAGS += -std=c++11 + } else:linux-clang* { + QMAKE_CXXFLAGS += -std=c++11 + QMAKE_LFLAGS += -stdlib=libc++ -lc++abi + } else:win32-g++* { + QMAKE_CXXFLAGS += -std=c++0x + } + # nothing to do for MSVC10+ +} isEqual(QT_MAJOR_VERSION, 5) { @@ -133,12 +149,6 @@ macx { IDE_DOC_PATH = $$IDE_DATA_PATH/doc IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS copydata = 1 - !isEqual(QT_MAJOR_VERSION, 5) { - # we use @rpath which is 10.5+ - # Qt5 doesn't support 10.5, and will set the minimum version to 10.6 or 10.7. - QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 - QMAKE_LFLAGS *= -mmacosx-version-min=10.5 - } } else { contains(TEMPLATE, vc.*):vcproj = 1 IDE_APP_TARGET = qtcreator |