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

QmlJS: Fix wrong conditions

Browse Source 
Change-Id: I31740bca2b17e635c28af70779334f2b52ddb709
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-19 18:24:37 +03:00
committed by Orgad Shaneh
parent 10e011c1e9
commit a77e75c36e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,11 +65,11 @@ bool ViewerContext::languageIsCompatible(Language::Enum l) const
return language == l; return language == l;
case Language::Qml: case Language::Qml:
return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::QmlQtQuick2 return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::QmlQtQuick2
|| Language::JavaScript; || l == Language::JavaScript;
case Language::QmlQtQuick1: case Language::QmlQtQuick1:
return l == Language::Qml || l == Language::QmlQtQuick1 || Language::JavaScript; return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::JavaScript;
case Language::QmlQtQuick2: case Language::QmlQtQuick2:
return l == Language::Qml || l == Language::QmlQtQuick2 || Language::JavaScript; return l == Language::Qml || l == Language::QmlQtQuick2 || l == Language::JavaScript;
case Language::Unknown: // ? case Language::Unknown: // ?
break; break;
} }