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

qmljs: split Unknown in NoLanguage and AnyLanguage

Browse Source 
Change-Id: I31276084af5e2f0c5f4ca861f17e29430563bb13
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-06-02 19:36:32 +02:00
parent 9cee5d3b22
commit def863eec6
8 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsviewercontext.cpp
View File

@@ -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)