Fix versioning of Qt Declarative's in-built types

Since we aren't releasing for 4.6, all types are new in 4.7.

Task-number: QTBUG-10081

6 files changed, 95 insertions, 95 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 16972a8..8e34472 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -83,58 +83,58 @@
 void QDeclarativeItemModule::defineModule()
 {
 #ifdef QT_NO_MOVIE
-    qmlRegisterTypeNotAvailable("Qt",4,6,"AnimatedImage",
+    qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
         qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
 #else
-    qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,6,"AnimatedImage");
+    qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,7,"AnimatedImage");
 #endif
-    qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage");
-    qmlRegisterType<QDeclarativeColumn>("Qt",4,6,"Column");
-    qmlRegisterType<QDeclarativeDrag>("Qt",4,6,"Drag");
-    qmlRegisterType<QDeclarativeFlickable>("Qt",4,6,"Flickable");
-    qmlRegisterType<QDeclarativeFlipable>("Qt",4,6,"Flipable");
-    qmlRegisterType<QDeclarativeFlow>("Qt",4,6,"Flow");
-    qmlRegisterType<QDeclarativeFocusPanel>("Qt",4,6,"FocusPanel");
-    qmlRegisterType<QDeclarativeFocusScope>("Qt",4,6,"FocusScope");
-    qmlRegisterType<QDeclarativeGradient>("Qt",4,6,"Gradient");
-    qmlRegisterType<QDeclarativeGradientStop>("Qt",4,6,"GradientStop");
-    qmlRegisterType<QDeclarativeGrid>("Qt",4,6,"Grid");
-    qmlRegisterType<QDeclarativeGridView>("Qt",4,6,"GridView");
-    qmlRegisterType<QDeclarativeImage>("Qt",4,6,"Image");
-    qmlRegisterType<QDeclarativeItem>("Qt",4,6,"Item");
-    qmlRegisterType<QDeclarativeLayoutItem>("Qt",4,6,"LayoutItem");
-    qmlRegisterType<QDeclarativeListView>("Qt",4,6,"ListView");
-    qmlRegisterType<QDeclarativeLoader>("Qt",4,6,"Loader");
-    qmlRegisterType<QDeclarativeMouseArea>("Qt",4,6,"MouseArea");
-    qmlRegisterType<QDeclarativePath>("Qt",4,6,"Path");
-    qmlRegisterType<QDeclarativePathAttribute>("Qt",4,6,"PathAttribute");
-    qmlRegisterType<QDeclarativePathCubic>("Qt",4,6,"PathCubic");
-    qmlRegisterType<QDeclarativePathLine>("Qt",4,6,"PathLine");
-    qmlRegisterType<QDeclarativePathPercent>("Qt",4,6,"PathPercent");
-    qmlRegisterType<QDeclarativePathQuad>("Qt",4,6,"PathQuad");
-    qmlRegisterType<QDeclarativePathView>("Qt",4,6,"PathView");
-    qmlRegisterType<QIntValidator>("Qt",4,6,"IntValidator");
+    qmlRegisterType<QDeclarativeBorderImage>("Qt",4,7,"BorderImage");
+    qmlRegisterType<QDeclarativeColumn>("Qt",4,7,"Column");
+    qmlRegisterType<QDeclarativeDrag>("Qt",4,7,"Drag");
+    qmlRegisterType<QDeclarativeFlickable>("Qt",4,7,"Flickable");
+    qmlRegisterType<QDeclarativeFlipable>("Qt",4,7,"Flipable");
+    qmlRegisterType<QDeclarativeFlow>("Qt",4,7,"Flow");
+    qmlRegisterType<QDeclarativeFocusPanel>("Qt",4,7,"FocusPanel");
+    qmlRegisterType<QDeclarativeFocusScope>("Qt",4,7,"FocusScope");
+    qmlRegisterType<QDeclarativeGradient>("Qt",4,7,"Gradient");
+    qmlRegisterType<QDeclarativeGradientStop>("Qt",4,7,"GradientStop");
+    qmlRegisterType<QDeclarativeGrid>("Qt",4,7,"Grid");
+    qmlRegisterType<QDeclarativeGridView>("Qt",4,7,"GridView");
+    qmlRegisterType<QDeclarativeImage>("Qt",4,7,"Image");
+    qmlRegisterType<QDeclarativeItem>("Qt",4,7,"Item");
+    qmlRegisterType<QDeclarativeLayoutItem>("Qt",4,7,"LayoutItem");
+    qmlRegisterType<QDeclarativeListView>("Qt",4,7,"ListView");
+    qmlRegisterType<QDeclarativeLoader>("Qt",4,7,"Loader");
+    qmlRegisterType<QDeclarativeMouseArea>("Qt",4,7,"MouseArea");
+    qmlRegisterType<QDeclarativePath>("Qt",4,7,"Path");
+    qmlRegisterType<QDeclarativePathAttribute>("Qt",4,7,"PathAttribute");
+    qmlRegisterType<QDeclarativePathCubic>("Qt",4,7,"PathCubic");
+    qmlRegisterType<QDeclarativePathLine>("Qt",4,7,"PathLine");
+    qmlRegisterType<QDeclarativePathPercent>("Qt",4,7,"PathPercent");
+    qmlRegisterType<QDeclarativePathQuad>("Qt",4,7,"PathQuad");
+    qmlRegisterType<QDeclarativePathView>("Qt",4,7,"PathView");
+    qmlRegisterType<QIntValidator>("Qt",4,7,"IntValidator");
     qmlRegisterType<QDoubleValidator>("Qt",4,7,"DoubleValidator");
     qmlRegisterType<QRegExpValidator>("Qt",4,7,"RegExpValidator");
-    qmlRegisterType<QDeclarativeRectangle>("Qt",4,6,"Rectangle");
-    qmlRegisterType<QDeclarativeRepeater>("Qt",4,6,"Repeater");
-    qmlRegisterType<QGraphicsRotation>("Qt",4,6,"Rotation");
-    qmlRegisterType<QDeclarativeRow>("Qt",4,6,"Row");
-    qmlRegisterType<QDeclarativeTranslate>("Qt",4,6,"Translate");
-    qmlRegisterType<QGraphicsScale>("Qt",4,6,"Scale");
-    qmlRegisterType<QDeclarativeText>("Qt",4,6,"Text");
-    qmlRegisterType<QDeclarativeTextEdit>("Qt",4,6,"TextEdit");
-    qmlRegisterType<QDeclarativeTextInput>("Qt",4,6,"TextInput");
-    qmlRegisterType<QDeclarativeViewSection>("Qt",4,6,"ViewSection");
-    qmlRegisterType<QDeclarativeVisualDataModel>("Qt",4,6,"VisualDataModel");
-    qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,6,"VisualItemModel");
+    qmlRegisterType<QDeclarativeRectangle>("Qt",4,7,"Rectangle");
+    qmlRegisterType<QDeclarativeRepeater>("Qt",4,7,"Repeater");
+    qmlRegisterType<QGraphicsRotation>("Qt",4,7,"Rotation");
+    qmlRegisterType<QDeclarativeRow>("Qt",4,7,"Row");
+    qmlRegisterType<QDeclarativeTranslate>("Qt",4,7,"Translate");
+    qmlRegisterType<QGraphicsScale>("Qt",4,7,"Scale");
+    qmlRegisterType<QDeclarativeText>("Qt",4,7,"Text");
+    qmlRegisterType<QDeclarativeTextEdit>("Qt",4,7,"TextEdit");
+    qmlRegisterType<QDeclarativeTextInput>("Qt",4,7,"TextInput");
+    qmlRegisterType<QDeclarativeViewSection>("Qt",4,7,"ViewSection");
+    qmlRegisterType<QDeclarativeVisualDataModel>("Qt",4,7,"VisualDataModel");
+    qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,7,"VisualItemModel");
 
     qmlRegisterType<QDeclarativeAnchors>();
     qmlRegisterType<QDeclarativeKeyEvent>();
     qmlRegisterType<QDeclarativeMouseEvent>();
     qmlRegisterType<QGraphicsObject>();
-    qmlRegisterType<QGraphicsWidget>("Qt",4,6,"QGraphicsWidget");
-    qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,6,"QGraphicsWidget");
+    qmlRegisterType<QGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
+    qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
     qmlRegisterType<QGraphicsTransform>();
     qmlRegisterType<QDeclarativePathElement>();
     qmlRegisterType<QDeclarativeCurve>();
@@ -146,18 +146,18 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeFlickableVisibleArea>();
 #ifdef QT_NO_GRAPHICSEFFECT
     QString no_graphicseffect = qApp->translate("QGraphicsBlurEffect","Qt was built without support for graphicseffects");
-    qmlRegisterTypeNotAvailable("Qt",4,6,"Blur",no_graphicseffect);
-    qmlRegisterTypeNotAvailable("Qt",4,6,"Colorize",no_graphicseffect);
-    qmlRegisterTypeNotAvailable("Qt",4,6,"DropShadow",no_graphicseffect);
-    qmlRegisterTypeNotAvailable("Qt",4,6,"Opacity",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,7,"Blur",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,7,"Colorize",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,7,"DropShadow",no_graphicseffect);
+    qmlRegisterTypeNotAvailable("Qt",4,7,"Opacity",no_graphicseffect);
 #else
     qmlRegisterType<QGraphicsEffect>();
-    qmlRegisterType<QGraphicsBlurEffect>("Qt",4,6,"Blur");
-    qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize");
-    qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,6,"DropShadow");
-    qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,6,"Opacity");
+    qmlRegisterType<QGraphicsBlurEffect>("Qt",4,7,"Blur");
+    qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,7,"Colorize");
+    qmlRegisterType<QGraphicsDropShadowEffect>("Qt",4,7,"DropShadow");
+    qmlRegisterType<QGraphicsOpacityEffect>("Qt",4,7,"Opacity");
 #endif
 
-    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,6,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
-    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,6,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+    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"));
 }
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 10cd886..edafe59 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1258,7 +1258,7 @@ bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctx
 
 int QDeclarativeCompiler::componentTypeRef()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,7);
     for (int ii = output->types.count() - 1; ii >= 0; --ii) {
         if (output->types.at(ii).type == t)
             return ii;
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index a41eaa9..6d64f63 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -144,9 +144,9 @@ static bool qt_QmlQtModule_registered = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
-    qmlRegisterType<QDeclarativeComponent>("Qt",4,6,"Component");
-    qmlRegisterType<QObject>("Qt",4,6,"QtObject");
-    qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,6,"WorkerScript");
+    qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component");
+    qmlRegisterType<QObject>("Qt",4,7,"QtObject");
+    qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript");
 
     qmlRegisterType<QDeclarativeBinding>();
 }
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index d4bb8ee..c6fe161 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -61,7 +61,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
 
         QString(),
 
-        "Qt", 4, 6, qmlName, &T::staticMetaObject,
+        "Qt", 4, 7, qmlName, &T::staticMetaObject,
 
         0, 0,
 
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 0611093..eb59fb1 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -76,52 +76,52 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
-    qmlRegisterType<QDeclarativeAnchorAnimation>("Qt",4,6,"AnchorAnimation");
-    qmlRegisterType<QDeclarativeAnchorChanges>("Qt",4,6,"AnchorChanges");
-    qmlRegisterType<QDeclarativeBehavior>("Qt",4,6,"Behavior");
-    qmlRegisterType<QDeclarativeBind>("Qt",4,6,"Binding");
-    qmlRegisterType<QDeclarativeColorAnimation>("Qt",4,6,"ColorAnimation");
-    qmlRegisterType<QDeclarativeConnections>("Qt",4,6,"Connections");
-    qmlRegisterType<QDeclarativeSmoothedAnimation>("Qt",4,6,"SmoothedAnimation");
-    qmlRegisterType<QDeclarativeSmoothedFollow>("Qt",4,6,"SmoothedFollow");
-    qmlRegisterType<QDeclarativeFontLoader>("Qt",4,6,"FontLoader");
-    qmlRegisterType<QDeclarativeListElement>("Qt",4,6,"ListElement");
-    qmlRegisterType<QDeclarativeNumberAnimation>("Qt",4,6,"NumberAnimation");
-    qmlRegisterType<QDeclarativePackage>("Qt",4,6,"Package");
-    qmlRegisterType<QDeclarativeParallelAnimation>("Qt",4,6,"ParallelAnimation");
-    qmlRegisterType<QDeclarativeParentAnimation>("Qt",4,6,"ParentAnimation");
-    qmlRegisterType<QDeclarativeParentChange>("Qt",4,6,"ParentChange");
-    qmlRegisterType<QDeclarativePauseAnimation>("Qt",4,6,"PauseAnimation");
-    qmlRegisterType<QDeclarativePropertyAction>("Qt",4,6,"PropertyAction");
-    qmlRegisterType<QDeclarativePropertyAnimation>("Qt",4,6,"PropertyAnimation");
-    qmlRegisterType<QDeclarativeRotationAnimation>("Qt",4,6,"RotationAnimation");
-    qmlRegisterType<QDeclarativeScriptAction>("Qt",4,6,"ScriptAction");
-    qmlRegisterType<QDeclarativeSequentialAnimation>("Qt",4,6,"SequentialAnimation");
-    qmlRegisterType<QDeclarativeSpringFollow>("Qt",4,6,"SpringFollow");
-    qmlRegisterType<QDeclarativeStateChangeScript>("Qt",4,6,"StateChangeScript");
-    qmlRegisterType<QDeclarativeStateGroup>("Qt",4,6,"StateGroup");
-    qmlRegisterType<QDeclarativeState>("Qt",4,6,"State");
-    qmlRegisterType<QDeclarativeSystemPalette>("Qt",4,6,"SystemPalette");
-    qmlRegisterType<QDeclarativeTimer>("Qt",4,6,"Timer");
-    qmlRegisterType<QDeclarativeTransition>("Qt",4,6,"Transition");
-    qmlRegisterType<QDeclarativeVector3dAnimation>("Qt",4,6,"Vector3dAnimation");
+    qmlRegisterType<QDeclarativeAnchorAnimation>("Qt",4,7,"AnchorAnimation");
+    qmlRegisterType<QDeclarativeAnchorChanges>("Qt",4,7,"AnchorChanges");
+    qmlRegisterType<QDeclarativeBehavior>("Qt",4,7,"Behavior");
+    qmlRegisterType<QDeclarativeBind>("Qt",4,7,"Binding");
+    qmlRegisterType<QDeclarativeColorAnimation>("Qt",4,7,"ColorAnimation");
+    qmlRegisterType<QDeclarativeConnections>("Qt",4,7,"Connections");
+    qmlRegisterType<QDeclarativeSmoothedAnimation>("Qt",4,7,"SmoothedAnimation");
+    qmlRegisterType<QDeclarativeSmoothedFollow>("Qt",4,7,"SmoothedFollow");
+    qmlRegisterType<QDeclarativeFontLoader>("Qt",4,7,"FontLoader");
+    qmlRegisterType<QDeclarativeListElement>("Qt",4,7,"ListElement");
+    qmlRegisterType<QDeclarativeNumberAnimation>("Qt",4,7,"NumberAnimation");
+    qmlRegisterType<QDeclarativePackage>("Qt",4,7,"Package");
+    qmlRegisterType<QDeclarativeParallelAnimation>("Qt",4,7,"ParallelAnimation");
+    qmlRegisterType<QDeclarativeParentAnimation>("Qt",4,7,"ParentAnimation");
+    qmlRegisterType<QDeclarativeParentChange>("Qt",4,7,"ParentChange");
+    qmlRegisterType<QDeclarativePauseAnimation>("Qt",4,7,"PauseAnimation");
+    qmlRegisterType<QDeclarativePropertyAction>("Qt",4,7,"PropertyAction");
+    qmlRegisterType<QDeclarativePropertyAnimation>("Qt",4,7,"PropertyAnimation");
+    qmlRegisterType<QDeclarativeRotationAnimation>("Qt",4,7,"RotationAnimation");
+    qmlRegisterType<QDeclarativeScriptAction>("Qt",4,7,"ScriptAction");
+    qmlRegisterType<QDeclarativeSequentialAnimation>("Qt",4,7,"SequentialAnimation");
+    qmlRegisterType<QDeclarativeSpringFollow>("Qt",4,7,"SpringFollow");
+    qmlRegisterType<QDeclarativeStateChangeScript>("Qt",4,7,"StateChangeScript");
+    qmlRegisterType<QDeclarativeStateGroup>("Qt",4,7,"StateGroup");
+    qmlRegisterType<QDeclarativeState>("Qt",4,7,"State");
+    qmlRegisterType<QDeclarativeSystemPalette>("Qt",4,7,"SystemPalette");
+    qmlRegisterType<QDeclarativeTimer>("Qt",4,7,"Timer");
+    qmlRegisterType<QDeclarativeTransition>("Qt",4,7,"Transition");
+    qmlRegisterType<QDeclarativeVector3dAnimation>("Qt",4,7,"Vector3dAnimation");
 #ifdef QT_NO_XMLPATTERNS
-    qmlRegisterTypeNotAvailable("Qt",4,6,"XmlListModel",
+    qmlRegisterTypeNotAvailable("Qt",4,7,"XmlListModel",
         qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
-    qmlRegisterTypeNotAvailable("Qt",4,6,"XmlRole",
+    qmlRegisterTypeNotAvailable("Qt",4,7,"XmlRole",
         qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
 #else
-    qmlRegisterType<QDeclarativeXmlListModel>("Qt",4,6,"XmlListModel");
-    qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,6,"XmlRole");
+    qmlRegisterType<QDeclarativeXmlListModel>("Qt",4,7,"XmlListModel");
+    qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,7,"XmlRole");
 #endif
 
     qmlRegisterType<QDeclarativeAnchors>();
     qmlRegisterType<QDeclarativeStateOperation>();
     qmlRegisterType<QDeclarativeAnchorSet>();
 
-    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,6,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
+    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
 
-    qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,6, "ListModel", new QDeclarativeListModelParser);
+    qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,7, "ListModel", new QDeclarativeListModelParser);
     qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 6, "PropertyChanges", new QDeclarativePropertyChangesParser);
     qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 6, "Connections", new QDeclarativeConnectionsParser);
 }
diff --git a/src/imports/widgets/widgets.cpp b/src/imports/widgets/widgets.cpp
index 1a71a68..20de1fe 100644
--- a/src/imports/widgets/widgets.cpp
+++ b/src/imports/widgets/widgets.cpp
@@ -57,9 +57,9 @@ public:
 
         qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
         qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem");
-        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout");
-        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout");
+        qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,7,"QGraphicsLinearLayoutStretchItem");
+        qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,7,"QGraphicsLinearLayout");
+        qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,7,"QGraphicsGridLayout");
     }
 };