diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-03-05 16:50:49 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-03-06 14:06:54 +0000 |
| commit | 8573623c6ec67323a0db1dba995b5ed3d05b569b (patch) | |
| tree | a6e0d78cf7678349013c3f221edfcb128d6dcdc3 /src/libs | |
| parent | 712766b7b1a77628f1bfe3ac7310a0cc444d7a76 (diff) | |
QmlJS: remove unused QtQuick2 check
Change-Id: I7d613ba825a5ce3d4d8302adff9c98f751bc7ab1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 9 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljscheck.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index a54371603c..65069cff59 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -664,13 +664,11 @@ Check::Check(Document::Ptr doc, const ContextPtr &context) , _importsOk(false) , _inStatementBinding(false) , _imports(nullptr) - , _isQtQuick2(false) { _imports = context->imports(doc.data()); if (_imports && !_imports->importFailed()) { _importsOk = true; - _isQtQuick2 = isQtQuick2(); } _enabledMessages = Utils::toSet(Message::allMessageTypes()); @@ -681,12 +679,9 @@ Check::Check(Document::Ptr doc, const ContextPtr &context) disableMessage(HintOneStatementPerLine); disableMessage(HintExtraParentheses); - if (isQtQuick2Ui()) { - disableQmlDesignerChecks(); - } else { - disableQmlDesignerChecks(); + disableQmlDesignerChecks(); + if (!isQtQuick2Ui()) disableQmlDesignerUiFileChecks(); - } } Check::~Check() diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h index 37704d801b..e5e110c5f9 100644 --- a/src/libs/qmljs/qmljscheck.h +++ b/src/libs/qmljs/qmljscheck.h @@ -154,7 +154,6 @@ private: bool _importsOk; bool _inStatementBinding; const Imports *_imports; - bool _isQtQuick2; }; } // namespace QmlJS |