Register QtQuick 1.0 module.

Qt 4.7 is still supported, but deprecated.

Reviewed-by: Martin Jones
Task-number: QTBUG-13799

4 files changed, 145 insertions, 31 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 783eff1..52703c2 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -97,7 +97,84 @@ void QDeclarativeItemModule::defineModule()
 {
     QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qgraphicsobject_autoParent };
     QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
+#ifdef QT_NO_MOVIE
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"AnimatedImage",
+        qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
+#else
+    qmlRegisterType<QDeclarativeAnimatedImage>("QtQuick",1,0,"AnimatedImage");
+#endif
+    qmlRegisterType<QDeclarativeBorderImage>("QtQuick",1,0,"BorderImage");
+    qmlRegisterType<QDeclarativeColumn>("QtQuick",1,0,"Column");
+    qmlRegisterType<QDeclarativeDrag>("QtQuick",1,0,"Drag");
+    qmlRegisterType<QDeclarativeFlickable>("QtQuick",1,0,"Flickable");
+    qmlRegisterType<QDeclarativeFlipable>("QtQuick",1,0,"Flipable");
+    qmlRegisterType<QDeclarativeFlow>("QtQuick",1,0,"Flow");
+    qmlRegisterType<QDeclarativeFocusPanel>("QtQuick",1,0,"FocusPanel");
+    qmlRegisterType<QDeclarativeFocusScope>("QtQuick",1,0,"FocusScope");
+    qmlRegisterType<QDeclarativeGradient>("QtQuick",1,0,"Gradient");
+    qmlRegisterType<QDeclarativeGradientStop>("QtQuick",1,0,"GradientStop");
+    qmlRegisterType<QDeclarativeGrid>("QtQuick",1,0,"Grid");
+    qmlRegisterType<QDeclarativeGridView>("QtQuick",1,0,"GridView");
+    qmlRegisterType<QDeclarativeImage>("QtQuick",1,0,"Image");
+    qmlRegisterType<QDeclarativeItem>("QtQuick",1,0,"Item");
+    qmlRegisterType<QDeclarativeLayoutItem>("QtQuick",1,0,"LayoutItem");
+    qmlRegisterType<QDeclarativeListView>("QtQuick",1,0,"ListView");
+    qmlRegisterType<QDeclarativeLoader>("QtQuick",1,0,"Loader");
+    qmlRegisterType<QDeclarativeMouseArea>("QtQuick",1,0,"MouseArea");
+    qmlRegisterType<QDeclarativePath>("QtQuick",1,0,"Path");
+    qmlRegisterType<QDeclarativePathAttribute>("QtQuick",1,0,"PathAttribute");
+    qmlRegisterType<QDeclarativePathCubic>("QtQuick",1,0,"PathCubic");
+    qmlRegisterType<QDeclarativePathLine>("QtQuick",1,0,"PathLine");
+    qmlRegisterType<QDeclarativePathPercent>("QtQuick",1,0,"PathPercent");
+    qmlRegisterType<QDeclarativePathQuad>("QtQuick",1,0,"PathQuad");
+    qmlRegisterType<QDeclarativePathView>("QtQuick",1,0,"PathView");
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QIntValidator>("QtQuick",1,0,"IntValidator");
+    qmlRegisterType<QDoubleValidator>("QtQuick",1,0,"DoubleValidator");
+    qmlRegisterType<QRegExpValidator>("QtQuick",1,0,"RegExpValidator");
+#endif
+    qmlRegisterType<QDeclarativeRectangle>("QtQuick",1,0,"Rectangle");
+    qmlRegisterType<QDeclarativeRepeater>("QtQuick",1,0,"Repeater");
+    qmlRegisterType<QGraphicsRotation>("QtQuick",1,0,"Rotation");
+    qmlRegisterType<QDeclarativeRow>("QtQuick",1,0,"Row");
+    qmlRegisterType<QDeclarativeTranslate>("QtQuick",1,0,"Translate");
+    qmlRegisterType<QGraphicsScale>("QtQuick",1,0,"Scale");
+    qmlRegisterType<QDeclarativeText>("QtQuick",1,0,"Text");
+    qmlRegisterType<QDeclarativeTextEdit>("QtQuick",1,0,"TextEdit");
+#ifndef QT_NO_LINEEDIT
+    qmlRegisterType<QDeclarativeTextInput>("QtQuick",1,0,"TextInput");
+#endif
+    qmlRegisterType<QDeclarativeViewSection>("QtQuick",1,0,"ViewSection");
+    qmlRegisterType<QDeclarativeVisualDataModel>("QtQuick",1,0,"VisualDataModel");
+    qmlRegisterType<QDeclarativeVisualItemModel>("QtQuick",1,0,"VisualItemModel");
 
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeKeyEvent>();
+    qmlRegisterType<QDeclarativeMouseEvent>();
+    qmlRegisterType<QGraphicsObject>();
+    qmlRegisterType<QGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterType<QGraphicsTransform>();
+    qmlRegisterType<QDeclarativePathElement>();
+    qmlRegisterType<QDeclarativeCurve>();
+    qmlRegisterType<QDeclarativeScaleGrid>();
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QValidator>();
+#endif
+    qmlRegisterType<QDeclarativeVisualModel>();
+#ifndef QT_NO_ACTION
+    qmlRegisterType<QAction>();
+#endif
+    qmlRegisterType<QDeclarativePen>();
+    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
+#ifndef QT_NO_GRAPHICSEFFECT
+    qmlRegisterType<QGraphicsEffect>();
+#endif
+
+    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("QtQuick",1,0,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
+    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("QtQuick",1,0,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+
+#ifndef QT_NO_IMPORT_QT47_QML
 #ifdef QT_NO_MOVIE
     qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
         qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
@@ -149,29 +226,10 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeVisualDataModel>("Qt",4,7,"VisualDataModel");
     qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,7,"VisualItemModel");
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeKeyEvent>();
-    qmlRegisterType<QDeclarativeMouseEvent>();
-    qmlRegisterType<QGraphicsObject>();
     qmlRegisterType<QGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
     qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
-    qmlRegisterType<QGraphicsTransform>();
-    qmlRegisterType<QDeclarativePathElement>();
-    qmlRegisterType<QDeclarativeCurve>();
-    qmlRegisterType<QDeclarativeScaleGrid>();
-#ifndef QT_NO_VALIDATOR
-    qmlRegisterType<QValidator>();
-#endif
-    qmlRegisterType<QDeclarativeVisualModel>();
-#ifndef QT_NO_ACTION
-    qmlRegisterType<QAction>();
-#endif
-    qmlRegisterType<QDeclarativePen>();
-    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
-#ifndef QT_NO_GRAPHICSEFFECT
-    qmlRegisterType<QGraphicsEffect>();
-#endif
 
     qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,7,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,7,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+#endif
 }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 26b3629..724553f 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
     \qml
     // MyRect.qml
 
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200; height: 200
@@ -177,9 +177,15 @@ static bool qt_QmlQtModule_registered = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
+    qmlRegisterType<QDeclarativeComponent>("QtQuick",1,0,"Component");
+    qmlRegisterType<QObject>("QtQuick",1,0,"QtObject");
+    qmlRegisterType<QDeclarativeWorkerScript>("QtQuick",1,0,"WorkerScript");
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component");
     qmlRegisterType<QObject>("Qt",4,7,"QtObject");
     qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript");
+#endif
 
     qmlRegisterType<QDeclarativeBinding>();
 }
@@ -198,7 +204,7 @@ with enums and functions.  To use it, call the members of the global \c Qt objec
 For example:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     color: Qt.rgba(255, 0, 0, 1)
@@ -510,7 +516,7 @@ QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine
   \code
   QDeclarativeEngine engine;
   QDeclarativeComponent component(&engine);
-  component.setData("import Qt 4.7\nText { text: \"Hello world!\" }", QUrl());
+  component.setData("import QtQuick 1.0\nText { text: \"Hello world!\" }", QUrl());
   QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
 
   //add item to view, etc
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index fda62ee..b9e9cec 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT int qt_defaultDpi();
 
 template<typename T>
-int qmlRegisterValueTypeEnums(const char *qmlName)
+int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
     QByteArray name(T::staticMetaObject.className());
 
@@ -63,7 +63,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
 
         QString(),
 
-        "Qt", 4, 7, qmlName, &T::staticMetaObject,
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
         0, 0,
 
@@ -99,8 +99,12 @@ bool QDeclarativeValueTypeFactory::isValueType(int idx)
 
 void QDeclarativeValueTypeFactory::registerValueTypes()
 {
-    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Easing");
-    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Font");
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("QtQuick",1,0,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("QtQuick",1,0,"Font");
+#ifndef QT_NO_IMPORT_QT47_QML
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Qt",4,7,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Qt",4,7,"Font");
+#endif
 }
 
 QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index c5bfebd..0544f22 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -75,6 +75,55 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
+    qmlRegisterType<QDeclarativeAnchorAnimation>("QtQuick",1,0,"AnchorAnimation");
+    qmlRegisterType<QDeclarativeAnchorChanges>("QtQuick",1,0,"AnchorChanges");
+    qmlRegisterType<QDeclarativeBehavior>("QtQuick",1,0,"Behavior");
+    qmlRegisterType<QDeclarativeBind>("QtQuick",1,0,"Binding");
+    qmlRegisterType<QDeclarativeColorAnimation>("QtQuick",1,0,"ColorAnimation");
+    qmlRegisterType<QDeclarativeConnections>("QtQuick",1,0,"Connections");
+    qmlRegisterType<QDeclarativeSmoothedAnimation>("QtQuick",1,0,"SmoothedAnimation");
+    qmlRegisterType<QDeclarativeFontLoader>("QtQuick",1,0,"FontLoader");
+    qmlRegisterType<QDeclarativeListElement>("QtQuick",1,0,"ListElement");
+    qmlRegisterType<QDeclarativeNumberAnimation>("QtQuick",1,0,"NumberAnimation");
+    qmlRegisterType<QDeclarativePackage>("QtQuick",1,0,"Package");
+    qmlRegisterType<QDeclarativeParallelAnimation>("QtQuick",1,0,"ParallelAnimation");
+    qmlRegisterType<QDeclarativeParentAnimation>("QtQuick",1,0,"ParentAnimation");
+    qmlRegisterType<QDeclarativeParentChange>("QtQuick",1,0,"ParentChange");
+    qmlRegisterType<QDeclarativePauseAnimation>("QtQuick",1,0,"PauseAnimation");
+    qmlRegisterType<QDeclarativePropertyAction>("QtQuick",1,0,"PropertyAction");
+    qmlRegisterType<QDeclarativePropertyAnimation>("QtQuick",1,0,"PropertyAnimation");
+    qmlRegisterType<QDeclarativeRotationAnimation>("QtQuick",1,0,"RotationAnimation");
+    qmlRegisterType<QDeclarativeScriptAction>("QtQuick",1,0,"ScriptAction");
+    qmlRegisterType<QDeclarativeSequentialAnimation>("QtQuick",1,0,"SequentialAnimation");
+    qmlRegisterType<QDeclarativeSpringAnimation>("QtQuick",1,0,"SpringAnimation");
+    qmlRegisterType<QDeclarativeStateChangeScript>("QtQuick",1,0,"StateChangeScript");
+    qmlRegisterType<QDeclarativeStateGroup>("QtQuick",1,0,"StateGroup");
+    qmlRegisterType<QDeclarativeState>("QtQuick",1,0,"State");
+    qmlRegisterType<QDeclarativeSystemPalette>("QtQuick",1,0,"SystemPalette");
+    qmlRegisterType<QDeclarativeTimer>("QtQuick",1,0,"Timer");
+    qmlRegisterType<QDeclarativeTransition>("QtQuick",1,0,"Transition");
+    qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",1,0,"Vector3dAnimation");
+#ifdef QT_NO_XMLPATTERNS
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlListModel",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlRole",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+#else
+    qmlRegisterType<QDeclarativeXmlListModel>("QtQuick",1,0,"XmlListModel");
+    qmlRegisterType<QDeclarativeXmlListModelRole>("QtQuick",1,0,"XmlRole");
+#endif
+
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeStateOperation>();
+    qmlRegisterType<QDeclarativeAnchorSet>();
+
+    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",1,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
+
+    qmlRegisterCustomType<QDeclarativeListModel>("QtQuick",1,0,"ListModel", new QDeclarativeListModelParser);
+    qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",1,0,"PropertyChanges", new QDeclarativePropertyChangesParser);
+    qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",1,0,"Connections", new QDeclarativeConnectionsParser);
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeAnchorAnimation>("Qt",4,7,"AnchorAnimation");
     qmlRegisterType<QDeclarativeAnchorChanges>("Qt",4,7,"AnchorChanges");
     qmlRegisterType<QDeclarativeBehavior>("Qt",4,7,"Behavior");
@@ -113,13 +162,10 @@ void QDeclarativeUtilModule::defineModule()
     qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,7,"XmlRole");
 #endif
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeStateOperation>();
-    qmlRegisterType<QDeclarativeAnchorSet>();
-
     qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
 
     qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,7, "ListModel", new QDeclarativeListModelParser);
     qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
     qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 7, "Connections", new QDeclarativeConnectionsParser);
+#endif
 }