diff options
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index b14bd39a52b..79ae1d59e90 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -869,7 +869,7 @@ void ModelManagerInterface::parseLoop(QSet<QString> &scannedPaths, continue; } if (language == Dialect::Qml - && (mainLanguage == Dialect::QmlQtQuick1 || mainLanguage == Dialect::QmlQtQuick2)) + && (mainLanguage == Dialect::QmlQtQuick2)) language = mainLanguage; if (language == Dialect::Qml && mainLanguage == Dialect::QmlQtQuick2Ui) language = Dialect::QmlQtQuick2; @@ -1146,18 +1146,7 @@ void ModelManagerInterface::updateImportPaths() if (!pathAtt.isEmpty()) allImportPaths.maybeInsert(Utils::FileName::fromString(pathAtt), Dialect::QmlQtQuick2); } - pInfoIter.toFront(); - while (pInfoIter.hasNext()) { - pInfoIter.next(); - QString pathAtt = pInfoIter.value().qtImportsPath; - if (!pathAtt.isEmpty()) - allImportPaths.maybeInsert(Utils::FileName::fromString(pathAtt), Dialect::QmlQtQuick1); - } - { - QString pathAtt = defaultProjectInfo().qtImportsPath; - if (!pathAtt.isEmpty()) - allImportPaths.maybeInsert(Utils::FileName::fromString(pathAtt), Dialect::QmlQtQuick1); - } + foreach (const QString &path, m_defaultImportPaths) allImportPaths.maybeInsert(Utils::FileName::fromString(path), Dialect::Qml); allImportPaths.compact(); @@ -1374,8 +1363,7 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, if (!doc.isNull() && ((vCtx.language == Dialect::AnyLanguage && doc->language() != Dialect::NoLanguage) || (vCtx.language == Dialect::Qml - && (doc->language() == Dialect::QmlQtQuick1 - || doc->language() == Dialect::QmlQtQuick2 + && (doc->language() == Dialect::QmlQtQuick2 || doc->language() == Dialect::QmlQtQuick2Ui)))) res.language = doc->language(); ProjectInfo info; @@ -1401,8 +1389,6 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, case Dialect::AnyLanguage: case Dialect::Qml: res.maybeAddPath(info.qtQmlPath); - Q_FALLTHROUGH(); - case Dialect::QmlQtQuick1: res.maybeAddPath(info.qtImportsPath); Q_FALLTHROUGH(); case Dialect::QmlQtQuick2: @@ -1447,12 +1433,10 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml || res.language == Dialect::QmlQtQuick2 || res.language == Dialect::QmlQtQuick2Ui) res.maybeAddPath(info.qtImportsPath); - if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml - || res.language == Dialect::QmlQtQuick1) + if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml) res.maybeAddPath(info.qtQmlPath); if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml - || res.language == Dialect::QmlQtQuick1 || res.language == Dialect::QmlQtQuick2 - || res.language == Dialect::QmlQtQuick2Ui) { + || res.language == Dialect::QmlQtQuick2 || res.language == Dialect::QmlQtQuick2Ui) { foreach (const QString &path, environmentImportPaths()) res.maybeAddPath(path); } @@ -1470,7 +1454,7 @@ ViewerContext ModelManagerInterface::defaultVContext(Dialect language, if (language == Dialect::AnyLanguage && doc->language() != Dialect::NoLanguage) language = doc->language(); else if (language == Dialect::Qml && - (doc->language() == Dialect::QmlQtQuick1 || doc->language() == Dialect::QmlQtQuick2 + (doc->language() == Dialect::QmlQtQuick2 || doc->language() == Dialect::QmlQtQuick2Ui)) language = doc->language(); } |