feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: set default -std=c++11 for Qt4

Browse Source 
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>
This commit is contained in:
Ivan Donchevskii
2017-08-17 09:31:16 +02:00
parent 58e8cf83ed
commit 410e31c665
8 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -275,8 +275,10 @@ void AutotoolsProject::updateCppCodeModel()
CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) { if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
activeQtVersion = CppTools::ProjectPart::Qt4; activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
activeQtVersion = CppTools::ProjectPart::Qt4Latest;
else else
activeQtVersion = CppTools::ProjectPart::Qt5; activeQtVersion = CppTools::ProjectPart::Qt5;
} }

6
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -164,8 +164,10 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) { if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
activeQtVersion = CppTools::ProjectPart::Qt4; activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
activeQtVersion = CppTools::ProjectPart::Qt4Latest;
else else
activeQtVersion = CppTools::ProjectPart::Qt5; activeQtVersion = CppTools::ProjectPart::Qt5;
} }

3
src/plugins/cpptools/cppcodemodelinspectordumper.cpp
View File

@@ -144,7 +144,8 @@ QString Utils::toString(ProjectPart::QtVersion qtVersion)
switch (qtVersion) { switch (qtVersion) {
CASE_QTVERSION(UnknownQt); CASE_QTVERSION(UnknownQt);
CASE_QTVERSION(NoQt); CASE_QTVERSION(NoQt);
CASE_QTVERSION(Qt4); CASE_QTVERSION(Qt4_8_6AndOlder);
CASE_QTVERSION(Qt4Latest);
CASE_QTVERSION(Qt5); CASE_QTVERSION(Qt5);
// no default to get a compiler warning if anything is added // no default to get a compiler warning if anything is added
} }

7
src/plugins/cpptools/cppprojectinfogenerator.cpp
View File

@@ -205,12 +205,15 @@ void ProjectInfoGenerator::createProjectParts(const RawProjectPart &rawProjectPa
const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart, const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart,
m_projectUpdateInfo.project); m_projectUpdateInfo.project);
ProjectPart::LanguageVersion defaultVersion = ProjectPart::LatestCxxVersion;
if (rawProjectPart.qtVersion == ProjectPart::Qt4_8_6AndOlder)
defaultVersion = ProjectPart::CXX11;
if (cat.hasCxxSources()) { if (cat.hasCxxSources()) {
createProjectPart(rawProjectPart, createProjectPart(rawProjectPart,
part, part,
cat.cxxSources(), cat.cxxSources(),
cat.partName("C++"), cat.partName("C++"),
ProjectPart::LatestCxxVersion, defaultVersion,
ProjectPart::NoExtensions); ProjectPart::NoExtensions);
} }
@@ -219,7 +222,7 @@ void ProjectInfoGenerator::createProjectParts(const RawProjectPart &rawProjectPa
part, part,
cat.objcxxSources(), cat.objcxxSources(),
cat.partName("Obj-C++"), cat.partName("Obj-C++"),
ProjectPart::LatestCxxVersion, defaultVersion,
ProjectPart::ObjectiveCExtensions); ProjectPart::ObjectiveCExtensions);
} }

3
src/plugins/cpptools/projectpart.h
View File

@@ -80,7 +80,8 @@ public:
enum QtVersion { enum QtVersion {
UnknownQt = -1, UnknownQt = -1,
NoQt, NoQt,
Qt4, Qt4_8_6AndOlder,
Qt4Latest,
Qt5 Qt5
}; };

6
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -432,8 +432,10 @@ void GenericProject::refreshCppCodeModel()
CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
if (QtSupport::BaseQtVersion *qtVersion = if (QtSupport::BaseQtVersion *qtVersion =
QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) { QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
activeQtVersion = CppTools::ProjectPart::Qt4; activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
activeQtVersion = CppTools::ProjectPart::Qt4Latest;
else else
activeQtVersion = CppTools::ProjectPart::Qt5; activeQtVersion = CppTools::ProjectPart::Qt5;
} }

6
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -906,8 +906,10 @@ void QbsProject::updateCppCodeModel()
CppTools::ProjectPart::QtVersion qtVersionFromKit = CppTools::ProjectPart::NoQt; CppTools::ProjectPart::QtVersion qtVersionFromKit = CppTools::ProjectPart::NoQt;
if (qtVersion) { if (qtVersion) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
qtVersionFromKit = CppTools::ProjectPart::Qt4; qtVersionFromKit = CppTools::ProjectPart::Qt4_8_6AndOlder;
else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
qtVersionFromKit = CppTools::ProjectPart::Qt4Latest;
else else
qtVersionFromKit = CppTools::ProjectPart::Qt5; qtVersionFromKit = CppTools::ProjectPart::Qt5;
} }

6
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -271,8 +271,10 @@ void QmakeProject::updateCppCodeModel()
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt; ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt;
if (qtVersion) { if (qtVersion) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
qtVersionForPart = ProjectPart::Qt4; qtVersionForPart = ProjectPart::Qt4_8_6AndOlder;
else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
qtVersionForPart = ProjectPart::Qt4Latest;
else else
qtVersionForPart = ProjectPart::Qt5; qtVersionForPart = ProjectPart::Qt5;
} }