Remove QtQuick1 elements from qtdeclarative

QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>

6 files changed, 10 insertions, 24 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index cc1705feca..30a23db4de 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -138,7 +138,7 @@ void QQuickItemPrivate::registerAccessorProperties()
     The following example moves the Y axis of the \l Rectangle elements while still allowing the \l Row element
     to lay the items out as if they had not been transformed:
     \qml
-    import QtQuick 1.0
+    import QtQuick 2.0
 
     Row {
         Rectangle {
@@ -4382,7 +4382,7 @@ qreal QQuickItem::implicitWidth() const
 
     \qml
     // Label.qml
-    import QtQuick 1.1
+    import QtQuick 2.0
 
     Item {
         property alias icon: image.source
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index b7bf5145dd..3d1e96da84 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -230,18 +230,9 @@ void QQuickItemsModule::defineModule()
         return;
     initialized = true;
 
-    // XXX todo -  Remove before final integration...
-    QByteArray mode = qgetenv("QMLSCENE_IMPORT_NAME");
     QByteArray name = "QtQuick";
     int majorVersion = 2;
     int minorVersion = 0;
-    if (mode == "quick1") {
-        majorVersion = 1;
-    } else if (mode == "qt") {
-        name = "Qt";
-        majorVersion = 4;
-        minorVersion = 7;
-    }
 
     qt_quickitems_defineModule(name, majorVersion, minorVersion);
 }
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 4d5776df56..9d1179efb8 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -2074,7 +2074,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import QtQuick 1.0
+        import QtQuick 2.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
@@ -2117,7 +2117,7 @@ void QQuickTextEdit::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import QtQuick 1.0
+        import QtQuick 2.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 5311b2dc04..65850b9a08 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1003,7 +1003,7 @@ void QQuickDoubleValidator::resetLocaleName()
     input of integers between 11 and 31 into the text input:
 
     \code
-    import QtQuick 1.0
+    import QtQuick 2.0
     TextInput{
         validator: IntValidator{bottom: 11; top: 31;}
         focus: true
@@ -2366,7 +2366,7 @@ void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode)
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import QtQuick 1.0
+        import QtQuick 2.0
         TextInput {
             id: textInput
             text: "Hello world!"
@@ -2409,7 +2409,7 @@ void QQuickTextInput::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import QtQuick 1.0
+        import QtQuick 2.0
         TextInput {
             id: textInput
             text: "Hello world!"
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index cac6be2aa0..7e3969c131 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -421,13 +421,8 @@ void QQuickViewPrivate::setRootObject(QObject *obj)
                    << "If your example is using QML 2, (such as qmlscene) and the .qml file you" << endl
                    << "loaded has 'import QtQuick 1.0' or 'import Qt 4.7', this error will occur." << endl
                    << endl
-                   << "To load files with 'import QtQuick 1.0' with QML 2, specify:" << endl
-                   << "  QMLSCENE_IMPORT_NAME=quick1" << endl
-                   << "on as an environment variable prior to launching the application." << endl
-                   << endl
-                   << "To load files with 'import Qt 4.7' with QML 2, specify:" << endl
-                   << "  QMLSCENE_IMPORT_NAME=qt" << endl
-                   << "on as an environment variable prior to launching the application." << endl;
+                   << "To load files with 'import QtQuick 1.0' or 'import Qt 4.7', use the" << endl
+                   << "QDeclarativeView class in the qtquick1 module." << endl;
         delete obj;
         root = 0;
     }
diff --git a/src/quick/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp
index 52393d59a3..2a24e3946c 100644
--- a/src/quick/items/qquickvisualitemmodel.cpp
+++ b/src/quick/items/qquickvisualitemmodel.cpp
@@ -132,7 +132,7 @@ public:
 
     The example below places three colored rectangles in a ListView.
     \code
-    import QtQuick 1.0
+    import QtQuick 2.0
 
     Rectangle {
         VisualItemModel {