From 404ed07fb08a6f301494db221b267d9fbea0f132 Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Tue, 24 Feb 2015 15:31:41 +0100
Subject: [PATCH] Revert "Raise the QML imports version to 2.1"

This reverts commit fa2109ccb6407e720ee7864cb55e74188f3417c0.

Turns out the plan to raise the version with every framework
release is not as simple as raising the version numbers as
this breaks pretty much everything.
---
 .../calendar/calendarplugin.cpp               |  6 ++--
 .../core/corebindingsplugin.cpp               | 34 +++++++++----------
 .../plasmacomponentsplugin.cpp                | 14 ++++----
 .../plasmaextracomponentsplugin.cpp           |  4 +--
 .../platformextensionplugin.cpp               |  4 +--
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/declarativeimports/calendar/calendarplugin.cpp b/src/declarativeimports/calendar/calendarplugin.cpp
index d5ded971b..bafe80cf7 100644
--- a/src/declarativeimports/calendar/calendarplugin.cpp
+++ b/src/declarativeimports/calendar/calendarplugin.cpp
@@ -27,8 +27,10 @@
 void CalendarPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.calendar"));
-    qmlRegisterType<CalendarData>(uri, 2, 1, "CalendarData");
-    qmlRegisterType<Calendar>(uri, 2, 1, "Calendar");
+    qmlRegisterType<CalendarData>(uri, 2, 0, "CalendarData");
+    qmlRegisterType<Calendar>(uri, 2, 0, "Calendar");
+//   qmlRegisterType<CalendarData>(uri, 1, 0, "CalendarData");
+//    qmlRegisterType<CalendarData>(uri, 1, 0, "Calendar");
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<QAbstractListModel>();
 }
diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp
index a9bdb01cc..ed241baa6 100644
--- a/src/declarativeimports/core/corebindingsplugin.cpp
+++ b/src/declarativeimports/core/corebindingsplugin.cpp
@@ -73,39 +73,39 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.core"));
 
-    qmlRegisterUncreatableType<Plasma::Types>(uri, 2, 1, "Types", "");
-    qmlRegisterUncreatableType<Units>(uri, 2, 1, "Units", "");
+    qmlRegisterUncreatableType<Plasma::Types>(uri, 2, 0, "Types", "");
+    qmlRegisterUncreatableType<Units>(uri, 2, 0, "Units", "");
 
-    qmlRegisterType<Plasma::Svg>(uri, 2, 1, "Svg");
-    qmlRegisterType<Plasma::FrameSvg>(uri, 2, 1, "FrameSvg");
-    qmlRegisterType<Plasma::SvgItem>(uri, 2, 1, "SvgItem");
-    qmlRegisterType<Plasma::FrameSvgItem>(uri, 2, 1, "FrameSvgItem");
+    qmlRegisterType<Plasma::Svg>(uri, 2, 0, "Svg");
+    qmlRegisterType<Plasma::FrameSvg>(uri, 2, 0, "FrameSvg");
+    qmlRegisterType<Plasma::SvgItem>(uri, 2, 0, "SvgItem");
+    qmlRegisterType<Plasma::FrameSvgItem>(uri, 2, 0, "FrameSvgItem");
 
-    //qmlRegisterType<ThemeProxy>(uri, 2, 1, "Theme");
-    qmlRegisterUncreatableType<Plasma::QuickTheme>(uri, 2, 1, "Theme", "It is not possible to instantiate Theme directly.");
-    qmlRegisterType<ColorScope>(uri, 2, 1, "ColorScope");
+    //qmlRegisterType<ThemeProxy>(uri, 2, 0, "Theme");
+    qmlRegisterUncreatableType<Plasma::QuickTheme>(uri, 2, 0, "Theme", "It is not possible to instantiate Theme directly.");
+    qmlRegisterType<ColorScope>(uri, 2, 0, "ColorScope");
 
-    qmlRegisterType<Plasma::DataSource>(uri, 2, 1, "DataSource");
-    qmlRegisterType<Plasma::DataModel>(uri, 2, 1, "DataModel");
-    qmlRegisterType<Plasma::SortFilterModel>(uri, 2, 1, "SortFilterModel");
+    qmlRegisterType<Plasma::DataSource>(uri, 2, 0, "DataSource");
+    qmlRegisterType<Plasma::DataModel>(uri, 2, 0, "DataModel");
+    qmlRegisterType<Plasma::SortFilterModel>(uri, 2, 0, "SortFilterModel");
 
-    qmlRegisterType<PlasmaQuick::Dialog>(uri, 2, 1, "Dialog");
-    qmlRegisterType<ToolTip>(uri, 2, 1, "ToolTipArea");
+    qmlRegisterType<PlasmaQuick::Dialog>(uri, 2, 0, "Dialog");
+    qmlRegisterType<ToolTip>(uri, 2, 0, "ToolTipArea");
 
     qmlRegisterInterface<Plasma::Service>("Service");
     qRegisterMetaType<Plasma::Service *>("Service");
     qmlRegisterInterface<Plasma::ServiceJob>("ServiceJob");
     qRegisterMetaType<Plasma::ServiceJob *>("ServiceJob");
-    qmlRegisterType<ServiceOperationStatus>(uri, 2, 1, "ServiceOperationStatus");
+    qmlRegisterType<ServiceOperationStatus>(uri, 2, 0, "ServiceOperationStatus");
     qmlRegisterType<QAbstractItemModel>();
 
     qmlRegisterType<QQmlPropertyMap>();
-    qmlRegisterType<IconItem>(uri, 2, 1, "IconItem");
+    qmlRegisterType<IconItem>(uri, 2, 0, "IconItem");
 
     qmlRegisterInterface<Plasma::DataSource>("DataSource");
     qRegisterMetaType<Plasma::DataSource *>("DataSource");
 
-    qmlRegisterType<Plasma::WindowThumbnail>(uri, 2, 1, "WindowThumbnail");
+    qmlRegisterType<Plasma::WindowThumbnail>(uri, 2, 0, "WindowThumbnail");
 }
 
 
diff --git a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
index 3ffbda2b7..d2ddc8e68 100644
--- a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
+++ b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
@@ -86,17 +86,17 @@ void PlasmaComponentsPlugin::registerTypes(const char *uri)
     //platform specific c++ components
     const QString target = KDeclarative::KDeclarative::componentsTarget();
     if (target == KDeclarative::KDeclarative::defaultComponentsTarget()) {
-        qmlRegisterType<QMenuProxy>(uri, 2, 1, "Menu");
-        qmlRegisterType<QMenuItem>(uri, 2, 1, "MenuItem");
+        qmlRegisterType<QMenuProxy>(uri, 2, 0, "Menu");
+        qmlRegisterType<QMenuItem>(uri, 2, 0, "MenuItem");
     } else {
-        // qmlRegisterType<FullScreenSheet>(uri, 2, 1, "Sheet");
+        // qmlRegisterType<FullScreenSheet>(uri, 2, 0, "Sheet");
     }
 
-    qmlRegisterType<Plasma::QRangeModel>(uri, 2, 1, "RangeModel");
+    qmlRegisterType<Plasma::QRangeModel>(uri, 2, 0, "RangeModel");
 
-    qmlRegisterUncreatableType<DialogStatus>(uri, 2, 1, "DialogStatus", "");
-    qmlRegisterUncreatableType<PageOrientation>(uri, 2, 1, "PageOrientation", "");
-    qmlRegisterUncreatableType<PageStatus>(uri, 2, 1, "PageStatus", "");
+    qmlRegisterUncreatableType<DialogStatus>(uri, 2, 0, "DialogStatus", "");
+    qmlRegisterUncreatableType<PageOrientation>(uri, 2, 0, "PageOrientation", "");
+    qmlRegisterUncreatableType<PageStatus>(uri, 2, 0, "PageStatus", "");
 }
 
 #include "moc_plasmacomponentsplugin.cpp"
diff --git a/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp b/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp
index 4d0d70a23..1a25f066e 100644
--- a/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp
+++ b/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp
@@ -38,8 +38,8 @@ void PlasmaExtraComponentsPlugin::initializeEngine(QQmlEngine *engine, const cha
 void PlasmaExtraComponentsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.extras"));
-    //qmlRegisterType<ResourceInstance>(uri, 2, 1, "ResourceInstance");
-    qmlRegisterType<FallbackComponent>(uri, 2, 1, "FallbackComponent");
+    //qmlRegisterType<ResourceInstance>(uri, 2, 0, "ResourceInstance");
+    qmlRegisterType<FallbackComponent>(uri, 2, 0, "FallbackComponent");
 }
 
 
diff --git a/src/declarativeimports/platformcomponents/platformextensionplugin.cpp b/src/declarativeimports/platformcomponents/platformextensionplugin.cpp
index 05807addd..9addf1fc2 100644
--- a/src/declarativeimports/platformcomponents/platformextensionplugin.cpp
+++ b/src/declarativeimports/platformcomponents/platformextensionplugin.cpp
@@ -38,8 +38,8 @@ public:
     void registerTypes(const char *uri) Q_DECL_OVERRIDE {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.plasma.platformcomponents"));
 
-        qmlRegisterType<Application> (uri, 2, 1, "Application");
-        qmlRegisterType<IconDialog> (uri, 2, 1, "IconDialog");
+        qmlRegisterType<Application> (uri, 2, 0, "Application");
+        qmlRegisterType<IconDialog> (uri, 2, 0, "IconDialog");
     }
 
 };