diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-06-02 19:36:32 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-07-01 10:19:50 +0200 |
| commit | def863eec671d06770db97d9b918a9426cdd2aae (patch) | |
| tree | 2fe05b9fcd2ea471168b6eb8db9d8cf111a59f7a /src/libs/qmljs/qmljsviewercontext.cpp | |
| parent | 9cee5d3b226728267540b7d584dea1b155fe1c5c (diff) | |
| download | qt-creator-def863eec671d06770db97d9b918a9426cdd2aae.tar.gz | |
qmljs: split Unknown in NoLanguage and AnyLanguage
Change-Id: I31276084af5e2f0c5f4ca861f17e29430563bb13
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsviewercontext.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsviewercontext.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsviewercontext.cpp b/src/libs/qmljs/qmljsviewercontext.cpp index 458ce2f24a..cec6605145 100644 --- a/src/libs/qmljs/qmljsviewercontext.cpp +++ b/src/libs/qmljs/qmljsviewercontext.cpp @@ -56,6 +56,8 @@ ViewerContext::ViewerContext(QStringList selectors, QStringList paths, */ bool ViewerContext::languageIsCompatible(Language::Enum l) const { + if (l == Language::AnyLanguage && language != Language::NoLanguage) + return true; switch (language) { case Language::JavaScript: case Language::Json: @@ -70,10 +72,12 @@ bool ViewerContext::languageIsCompatible(Language::Enum l) const return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::JavaScript; case Language::QmlQtQuick2: return l == Language::Qml || l == Language::QmlQtQuick2 || l == Language::JavaScript; - case Language::Unknown: // ? + case Language::AnyLanguage: + return true; + case Language::NoLanguage: break; } - return true; + return false; } void ViewerContext::maybeAddPath(const QString &path) |