diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 0829666ef5a..4e7afec62fb 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -53,6 +53,8 @@ #include #include #include +#include +#include #include #include @@ -408,6 +410,16 @@ void AutotoolsProject::updateCppCodeModel() CppTools::ProjectInfo pInfo(this); CppTools::ProjectPartBuilder ppBuilder(pInfo); + CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; + if (QtSupport::BaseQtVersion *qtVersion = + QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) { + if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) + activeQtVersion = CppTools::ProjectPart::Qt4; + else + activeQtVersion = CppTools::ProjectPart::Qt5; + } + + ppBuilder.setQtVersion(activeQtVersion); const QStringList cflags = m_makefileParserThread->cflags(); QStringList cxxflags = m_makefileParserThread->cxxflags(); if (cxxflags.isEmpty()) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 8434d2bb52f..eac208d2249 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -317,6 +317,16 @@ bool CMakeProject::parseCMakeLists() CppTools::ProjectInfo pinfo(this); CppTools::ProjectPartBuilder ppBuilder(pinfo); + 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; + else + activeQtVersion = CppTools::ProjectPart::Qt5; + } + + ppBuilder.setQtVersion(activeQtVersion); + foreach (const CMakeBuildTarget &cbt, m_buildTargets) { // This explicitly adds -I. to the include paths QStringList includePaths = cbt.includeFiles; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index ce33b8a889d..f006984922d 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -46,7 +46,9 @@ #include #include #include +#include #include +#include #include #include @@ -349,6 +351,17 @@ void GenericProject::refreshCppCodeModel() CppTools::ProjectInfo pInfo(this); CppTools::ProjectPartBuilder ppBuilder(pInfo); + + CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; + if (QtSupport::BaseQtVersion *qtVersion = + QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) { + if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0)) + activeQtVersion = CppTools::ProjectPart::Qt4; + else + activeQtVersion = CppTools::ProjectPart::Qt5; + } + + ppBuilder.setQtVersion(activeQtVersion); ppBuilder.setIncludePaths(projectIncludePaths()); ppBuilder.setConfigFileName(configFileName()); ppBuilder.setCxxFlags(QStringList() << QLatin1String("-std=c++11"));