diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-10-13 16:46:30 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-10-14 14:46:32 +0200 |
| commit | 419d4e4411dda6452a69e2f9c00ea9dd0e4108da (patch) | |
| tree | ec5dacd7393030790e182c02a5b1599e1a2e1377 /src/libs/qmljs/qmljscheck.cpp | |
| parent | 65aef999ce0772cc6887c6175d2f4f913e230527 (diff) | |
| download | qt-creator-419d4e4411dda6452a69e2f9c00ea9dd0e4108da.tar.gz | |
Add ui.qml support to code mode and editor
Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 403355426f..9db241266a 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -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) |