qmljs: remove remaining references to QtQuick1

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>

5 files changed, 3 insertions, 23 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 013854c698..56023ee2bf 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -2045,12 +2045,8 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
             else
                 errors->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
         }
-        if (message.severity == Severity::Warning) {
-            if (message.type == StaticAnalysis::WarnAboutQtQuick1InsteadQtQuick2)
-                errors->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
-            else
-                warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
-        }
+        if (message.severity == Severity::Warning)
+            warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
     }
 }
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 1b81f80b28..c5710957da 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -102,8 +102,7 @@ static bool checkIfEditorIsQtQuick(Core::IEditor *editor)
         QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
         QmlJS::Document::Ptr document = modelManager->ensuredGetDocumentForPath(editor->document()->filePath().toString());
         if (!document.isNull())
-            return document->language() == QmlJS::Dialect::QmlQtQuick1
-                    || document->language() == QmlJS::Dialect::QmlQtQuick2
+            return document->language() == QmlJS::Dialect::QmlQtQuick2
                     || document->language() == QmlJS::Dialect::QmlQtQuick2Ui
                     || document->language() == QmlJS::Dialect::Qml;
 
diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp
index d73665f9da..b1058176af 100644
--- a/src/plugins/qmljstools/qmljsbundleprovider.cpp
+++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp
@@ -68,16 +68,6 @@ QmlBundle BasicBundleProvider::defaultBundle(const QString &bundleInfoName)
     return res;
 }
 
-QmlBundle BasicBundleProvider::defaultQt4QtQuick1Bundle()
-{
-    return defaultBundle(QLatin1String("qt4QtQuick1-bundle.json"));
-}
-
-QmlBundle BasicBundleProvider::defaultQt5QtQuick1Bundle()
-{
-    return defaultBundle(QLatin1String("qt5QtQuick1-bundle.json"));
-}
-
 QmlBundle BasicBundleProvider::defaultQt5QtQuick2Bundle()
 {
     return defaultBundle(QLatin1String("qt5QtQuick2-bundle.json"));
diff --git a/src/plugins/qmljstools/qmljsbundleprovider.h b/src/plugins/qmljstools/qmljsbundleprovider.h
index 8fc2258c69..a0bf3b4c3d 100644
--- a/src/plugins/qmljstools/qmljsbundleprovider.h
+++ b/src/plugins/qmljstools/qmljsbundleprovider.h
@@ -66,8 +66,6 @@ public:
                                     , const QHash<QString,QString> &replacements);
 
     static QmlJS::QmlBundle defaultBundle(const QString &bundleInfoName);
-    static QmlJS::QmlBundle defaultQt4QtQuick1Bundle();
-    static QmlJS::QmlBundle defaultQt5QtQuick1Bundle();
     static QmlJS::QmlBundle defaultQt5QtQuick2Bundle();
     static QmlJS::QmlBundle defaultQbsBundle();
     static QmlJS::QmlBundle defaultQmltypesBundle();
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index f64e3c9978..85b5e55784 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -411,9 +411,6 @@ static QString getInitialDetails(const QmlEventType &event)
                     details.startsWith(QLatin1String("qrc:/")))
                 details = details.mid(details.lastIndexOf(QLatin1Char('/')) + 1);
         }
-    } else if (event.rangeType() == Painting) {
-        // QtQuick1 animations always run in GUI thread.
-        details = QmlProfilerModelManager::tr("GUI Thread");
     }
 
     return details;