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

Add ui.qml support to code mode and editor

Browse Source 
Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-10-13 16:46:30 +02:00
parent 65aef999ce
commit 419d4e4411
11 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/qmljs/qmljscheck.cpp
View File

@@ -1390,12 +1390,20 @@ void Check::warnAboutUnnecessarySuppressions()
bool Check::isQtQuick2() const
{
foreach (const Import &import, _imports->all()) {
if (import.info.name() == QLatin1String("QtQuick")
&& import.info.version().majorVersion() == 2)
return true;
if (_doc->language() == Dialect::Qml) {
foreach (const Import &import, _imports->all()) {
if (import.info.name() == QLatin1String("QtQuick")
&& import.info.version().majorVersion() == 2)
return true;
}
return false;
}
return false;
return _doc->language() == Dialect::QmlQtQuick2 || _doc->language() == Dialect::QmlQtQuick2Ui;
}
bool Check::isQtQuick2Ui() const
{
return _doc->language() == Dialect::QmlQtQuick2Ui;
}
bool Check::visit(NewExpression *ast)