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 <[email protected]>

9 files changed, 10 insertions, 57 deletions

diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 1acedaf4a09..805700f9428 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -676,7 +676,6 @@ void Check::enableQmlDesignerChecks()
     enableMessage(WarnImperativeCodeNotEditableInVisualDesigner);
     enableMessage(WarnUnsupportedTypeInVisualDesigner);
     enableMessage(WarnReferenceToParentItemNotSupportedByVisualDesigner);
-    enableMessage(WarnAboutQtQuick1InsteadQtQuick2);
     enableMessage(ErrUnsupportedRootTypeInVisualDesigner);
     enableMessage(ErrInvalidIdeInVisualDesigner);
     //## triggers too often ## check.enableMessage(StaticAnalysis::WarnUndefinedValueForVisualDesigner);
@@ -910,12 +909,6 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
             if (iter.error() != PrototypeIterator::NoError)
                 typeError = true;
             const ObjectValue *lastPrototype = prototypes.last();
-            foreach (const ObjectValue *objectValue, prototypes) {
-                if (objectValue->className() == QLatin1String("QGraphicsObject")
-                        && _isQtQuick2) {
-                    addMessage(WarnAboutQtQuick1InsteadQtQuick2, typeErrorLocation);
-                }
-            }
 
             if (iter.error() == PrototypeIterator::ReferenceResolutionError) {
                 if (const QmlPrototypeReference *ref =
diff --git a/src/libs/qmljs/qmljsconstants.h b/src/libs/qmljs/qmljsconstants.h
index 9cbf9fb19b9..b98db27a329 100644
--- a/src/libs/qmljs/qmljsconstants.h
+++ b/src/libs/qmljs/qmljsconstants.h
@@ -72,7 +72,6 @@ enum Enum
     JavaScript = 1,
     Json = 2,
     Qml = 3,
-    QmlQtQuick1 = 4,
     QmlQtQuick2 = 5,
     QmlQbs = 6,
     QmlProject = 7,
diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp
index 9746490871f..0cb463b2e5c 100644
--- a/src/libs/qmljs/qmljsdialect.cpp
+++ b/src/libs/qmljs/qmljsdialect.cpp
@@ -35,7 +35,6 @@ bool Dialect::isQmlLikeLanguage() const
 {
     switch (m_dialect) {
     case Dialect::Qml:
-    case Dialect::QmlQtQuick1:
     case Dialect::QmlQtQuick2:
     case Dialect::QmlQtQuick2Ui:
     case Dialect::QmlQbs:
@@ -54,7 +53,6 @@ bool Dialect::isFullySupportedLanguage() const
     case Dialect::JavaScript:
     case Dialect::Json:
     case Dialect::Qml:
-    case Dialect::QmlQtQuick1:
     case Dialect::QmlQtQuick2:
     case Dialect::QmlQtQuick2Ui:
         return true;
@@ -72,7 +70,6 @@ bool Dialect::isQmlLikeOrJsLanguage() const
 {
     switch (m_dialect) {
     case Dialect::Qml:
-    case Dialect::QmlQtQuick1:
     case Dialect::QmlQtQuick2:
     case Dialect::QmlQtQuick2Ui:
     case Dialect::QmlQbs:
@@ -95,8 +92,6 @@ QString Dialect::toString() const
         return QLatin1String("Json");
     case Dialect::Qml:
         return QLatin1String("Qml");
-    case Dialect::QmlQtQuick1:
-        return QLatin1String("QmlQtQuick1");
     case Dialect::QmlQtQuick2:
         return QLatin1String("QmlQtQuick2");
     case Dialect::QmlQtQuick2Ui:
@@ -206,11 +201,7 @@ QList<Dialect> Dialect::companionLanguages() const
         langs << Dialect::JavaScript;
         break;
     case Dialect::Qml:
-        langs << Dialect::QmlQtQuick1 << Dialect::QmlQtQuick2 << Dialect::QmlQtQuick2Ui
-              << Dialect::JavaScript;
-        break;
-    case Dialect::QmlQtQuick1:
-        langs << Dialect::Qml << Dialect::JavaScript;
+        langs << Dialect::QmlQtQuick2 << Dialect::QmlQtQuick2Ui << Dialect::JavaScript;
         break;
     case Dialect::QmlQtQuick2:
     case Dialect::QmlQtQuick2Ui:
@@ -220,7 +211,7 @@ QList<Dialect> Dialect::companionLanguages() const
         break;
     case Dialect::AnyLanguage:
         langs << Dialect::JavaScript << Dialect::Json << Dialect::QmlProject << Dialect:: QmlQbs
-              << Dialect::QmlTypeInfo << Dialect::QmlQtQuick1 << Dialect::QmlQtQuick2
+              << Dialect::QmlTypeInfo << Dialect::QmlQtQuick2
               << Dialect::QmlQtQuick2Ui << Dialect::Qml;
         break;
     case Dialect::NoLanguage:
diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h
index 4feb8f7816f..8d1ca30debb 100644
--- a/src/libs/qmljs/qmljsdialect.h
+++ b/src/libs/qmljs/qmljsdialect.h
@@ -41,7 +41,6 @@ public:
         JavaScript = 1,
         Json = 2,
         Qml = 3,
-        QmlQtQuick1 = 4,
         QmlQtQuick2 = 5,
         QmlQbs = 6,
         QmlProject = 7,
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();
     }
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index 7ada84f28b8..e8bd19a906e 100644
--- a/src/libs/qmljs/qmljsplugindumper.cpp
+++ b/src/libs/qmljs/qmljsplugindumper.cpp
@@ -116,13 +116,6 @@ void PluginDumper::onLoadBuiltinTypes(const QmlJS::ModelManagerInterface::Projec
         loadQmltypesFile(QStringList(builtinQmltypesPath), baseImportsPath, builtinInfo);
         return;
     }
-    // QTDIR/imports/QtQuick1/builtins.qmltypes was used in developer builds of 5.0.0, 5.0.1
-    const QString builtinQmltypesPath2 = info.qtImportsPath
-            + QLatin1String("/QtQuick1/builtins.qmltypes");
-    if (QFile::exists(builtinQmltypesPath2)) {
-        loadQmltypesFile(QStringList(builtinQmltypesPath2), baseImportsPath, builtinInfo);
-        return;
-    }
 
     runQmlDump(info, QStringList(QLatin1String("--builtins")), baseImportsPath);
     m_qtToInfo.insert(baseImportsPath, info);
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
index 0de66fd1c5d..a9677bb373f 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
@@ -222,8 +222,6 @@ StaticAnalysisMessages::StaticAnalysisMessages()
             tr("Qt Quick Designer only supports states in the root item."));
     newMsg(ErrInvalidIdeInVisualDesigner, Error,
            tr("This id might be ambiguous and is not supported in the Qt Quick Designer."));
-    newMsg(WarnAboutQtQuick1InsteadQtQuick2, Warning,
-            tr("Using Qt Quick 1 code model instead of Qt Quick 2."));
     newMsg(ErrUnsupportedRootTypeInVisualDesigner, Error,
            tr("This type (%1) is not supported as a root element by Qt Quick Designer."), 1);
     newMsg(ErrUnsupportedRootTypeInQmlUi, Error,
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.h b/src/libs/qmljs/qmljsstaticanalysismessage.h
index 109a85a0276..c66a30946b7 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.h
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.h
@@ -128,8 +128,7 @@ enum Type
     ErrInvalidStringValuePattern = 320,
     ErrLongerStringValueExpected = 321,
     ErrShorterStringValueExpected = 322,
-    ErrInvalidArrayValueLength = 323,
-    WarnAboutQtQuick1InsteadQtQuick2 = 324
+    ErrInvalidArrayValueLength = 323
 };
 
 class QMLJS_EXPORT PrototypeMessageData {
diff --git a/src/libs/qmljs/qmljsviewercontext.cpp b/src/libs/qmljs/qmljsviewercontext.cpp
index d034432dc41..bc5d8e5b487 100644
--- a/src/libs/qmljs/qmljsviewercontext.cpp
+++ b/src/libs/qmljs/qmljsviewercontext.cpp
@@ -62,10 +62,7 @@ bool ViewerContext::languageIsCompatible(Dialect l) const
     case Dialect::QmlTypeInfo:
         return language == l;
     case Dialect::Qml:
-        return l == Dialect::Qml || l == Dialect::QmlQtQuick1 || l == Dialect::QmlQtQuick2
-                || l == Dialect::JavaScript;
-    case Dialect::QmlQtQuick1:
-        return l == Dialect::Qml || l == Dialect::QmlQtQuick1 || l == Dialect::JavaScript;
+        return l == Dialect::Qml || l == Dialect::QmlQtQuick2 || l == Dialect::JavaScript;
     case Dialect::QmlQtQuick2:
     case Dialect::QmlQtQuick2Ui:
         return l == Dialect::Qml || l == Dialect::QmlQtQuick2 || l == Dialect::QmlQtQuick2Ui