Restore version 2.0 for the .impl imports

It's a bit of extra hassle, but the type registration can be done so
that we keep the old version available to avoid deliberately breaking
apps that have had to import .impl to gain access to the internal
goodies. For example, someone may have made a copy of one of the
controls as our documentation suggests. :)

Change-Id: I5308d7e74ecebf69da7fe9c6912380f72c3c9a2b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 10 insertions, 9 deletions

diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
index aa0aea34..394e9162 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
@@ -77,7 +77,7 @@ QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObje
 void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri)
 {
     qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property"));
-    qmlRegisterUncreatableType<QQuickUniversalStyle, 1>(uri, 2, 1, "Universal", tr("Universal is an attached property"));
+    qmlRegisterRevision<QQuickUniversalStyle, 1>(uri, 2, 1);
 }
 
 void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -87,14 +87,15 @@ void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine,
     engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/Universal/images")));
 
     QByteArray import = QByteArray(uri) + ".impl";
-    qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 1, "FocusRectangle");
-    qmlRegisterType<QQuickUniversalProgressRing>(import, 2, 1, "ProgressRing");
-    qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 2, 1, "ProgressRingAnimator");
-    qmlRegisterType<QQuickUniversalProgressStrip>(import, 2, 1, "ProgressStrip");
-    qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 2, 1, "ProgressStripAnimator");
-
-    qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 1, "RadioIndicator");
-    qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 1, "SwitchIndicator");
+    qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle");
+    qmlRegisterRevision<QQuickUniversalFocusRectangle, 1>(import, 2, 1);
+    qmlRegisterType<QQuickUniversalProgressRing>(import, 2, 0, "ProgressRing");
+    qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 2, 0, "ProgressRingAnimator");
+    qmlRegisterType<QQuickUniversalProgressStrip>(import, 2, 0, "ProgressStrip");
+    qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 2, 0, "ProgressStripAnimator");
+
+    qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator");
+    qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
 }
 
 QString QtQuickControls2UniversalStylePlugin::name() const