Commit e188244f authored by Sergey Shambir's avatar Sergey Shambir Committed by Erik Verbruggen
Browse files

Set NoQt as qt version for non-qt projects



Change-Id: I292357c84f3633ffc3cb17f44b66d6de9c268966
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
parent a6eb1b26
......@@ -32,6 +32,20 @@
#include <QtCore/QSet>
/*!
\enum CPlusPlus::CppModelManagerInterface::QtVersion
Allows C++ parser engine to inject headers or change inner settings as
needed to parse Qt language extensions for concrete major Qt version
\value UnknownQt
Parser may choose any policy
\value NoQt
Parser must not use special tricks, because it parses non-qt project
\value Qt4
Parser may enable tricks for Qt v4.x
\value Qt5
Parser may enable tricks for Qt v5.x
*/
using namespace CPlusPlus;
static CppModelManagerInterface *g_instance = 0;
......
......@@ -588,7 +588,11 @@ void Qt4Project::updateCppCodeModel()
QStringList allFiles;
foreach (Qt4ProFileNode *pro, proFiles) {
ProjectPart::Ptr part(new ProjectPart);
part->qtVersion = qtVersionForPart;
if (pro->variableValue(ConfigVar).contains(QLatin1String("qt")))
part->qtVersion = qtVersionForPart;
else
part->qtVersion = ProjectPart::NoQt;
QStringList cxxflags = pro->variableValue(CppFlagsVar);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment