diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-08-17 09:31:16 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2017-09-05 09:37:14 +0000 |
| commit | 410e31c665d6b89c3f1c16408bbecbefde1451d5 (patch) | |
| tree | a29083c75033678fa2b6105096ce109ccbce2afd /src/plugins/autotoolsprojectmanager | |
| parent | 58e8cf83ed14dde10c3ee64e89544e1a505c535a (diff) | |
| download | qt-creator-410e31c665d6b89c3f1c16408bbecbefde1451d5.tar.gz | |
CppTools: set default -std=c++11 for Qt4
qmake from Qt4 does not provide C++ standard and
clang can't properly compile Qt4.8.6 and earlier
with c++1z. Behavior in this commit mimics qmake
from Qt5 which also provides c++11 as a default
standard.
Task-number: QTCREATORBUG-16441
Change-Id: I3d29891d6e47f2367f2b3b2bf4be4d86661924e9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 38257ad754..e4a89e9edc 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -275,8 +275,10 @@ void AutotoolsProject::updateCppCodeModel() CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) { - if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) - activeQtVersion = CppTools::ProjectPart::Qt4; + if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6)) + activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder; + else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) + activeQtVersion = CppTools::ProjectPart::Qt4Latest; else activeQtVersion = CppTools::ProjectPart::Qt5; } |