summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/CppDocument.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-10-06 02:41:22 +0200
committerhjk <hjk121@nokiamail.com>2013-10-15 16:22:28 +0200
commit2b532c73ee96314c4af5d7ff0ecd4c31c6f81730 (patch)
tree3d7d4fc1adb7800a13fdf2ca37fee9f1ed485d76 /src/libs/cplusplus/CppDocument.cpp
parent0a600e041afd7478aef528c61776a0fc660fd175 (diff)
downloadqt-creator-2b532c73ee96314c4af5d7ff0ecd4c31c6f81730.tar.gz
CPlusPlus: Make (sub-)languague selection more generic
Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/cplusplus/CppDocument.cpp')
-rw-r--r--src/libs/cplusplus/CppDocument.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 0d8bbd2f31..46fee7f443 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -284,10 +284,14 @@ Document::Document(const QString &fileName)
const QByteArray localFileName = fileName.toUtf8();
const StringLiteral *fileId = _control->stringLiteral(localFileName.constData(),
localFileName.size());
+ LanguageFeatures features;
+ features.qtEnabled = true;
+ features.qtMocRunEnabled = true;
+ features.qtKeywordsEnabled = true;
+ features.cxx11Enabled = true;
+ features.objCEnabled = true;
_translationUnit = new TranslationUnit(_control, fileId);
- _translationUnit->setQtMocRunEnabled(true);
- _translationUnit->setCxxOxEnabled(true);
- _translationUnit->setObjCEnabled(true);
+ _translationUnit->setLanguageFeatures(features);
(void) _control->switchTranslationUnit(_translationUnit);
}