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

qmljs: remove remaining references to QtQuick1

Browse Source 
This patch removes all references to QtQuick1 in qml library,
plugin, designer, profiler and tests.

Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Marco Benelli
2018-02-19 12:26:51 +01:00
parent 4e4a07ea1d
commit b9d72a5737
17 changed files with 15 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,10 +62,7 @@ bool ViewerContext::languageIsCompatible(Dialect l) const
case Dialect::QmlTypeInfo:
return language == l;
case Dialect::Qml:
return l == Dialect::Qml || l == Dialect::QmlQtQuick1 || l == Dialect::QmlQtQuick2
|| l == Dialect::JavaScript;
case Dialect::QmlQtQuick1:
return l == Dialect::Qml || l == Dialect::QmlQtQuick1 || l == Dialect::JavaScript;
return l == Dialect::Qml || l == Dialect::QmlQtQuick2 || l == Dialect::JavaScript;
case Dialect::QmlQtQuick2:
case Dialect::QmlQtQuick2Ui:
return l == Dialect::Qml || l == Dialect::QmlQtQuick2 || l == Dialect::QmlQtQuick2Ui