From f9061787136e3759a62e8468ab35ab5062cb1440 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 24 Jan 2018 13:25:40 +0100
Subject: [PATCH] parametrize qqc2 version

Summary:
for styles in order to work at all they need to import
the latest available qqc2 version installed in the system
or any app using new qqc2 feature will fail to load.
do like in qqc2-desktop-style and set the import version
at build time

Test Plan: all generated files have 2.3 here as version and apps using qqc2 still oload

Reviewers: #plasma, bshah

Reviewed By: #plasma, bshah

Subscribers: plasma-devel, #frameworks

Tags: #plasma, #frameworks

Differential Revision: https://phabricator.kde.org/D10074
---
 CMakeLists.txt                                |  2 +-
 src/declarativeimports/CMakeLists.txt         | 83 ++++++++++++-------
 .../plasmacomponents3/BusyIndicator.qml       |  2 +-
 .../plasmacomponents3/Button.qml              |  2 +-
 .../plasmacomponents3/CheckBox.qml            |  4 +-
 .../plasmacomponents3/CheckDelegate.qml       |  2 +-
 .../plasmacomponents3/ComboBox.qml            |  4 +-
 .../plasmacomponents3/Container.qml           |  2 +-
 .../plasmacomponents3/Control.qml             |  2 +-
 .../plasmacomponents3/Dial.qml                |  2 +-
 .../plasmacomponents3/Dialog.qml              |  2 +-
 .../plasmacomponents3/DialogButtonBox.qml     |  2 +-
 .../plasmacomponents3/Drawer.qml              |  2 +-
 .../plasmacomponents3/Frame.qml               |  4 +-
 .../plasmacomponents3/GroupBox.qml            |  4 +-
 .../plasmacomponents3/ItemDelegate.qml        |  2 +-
 .../plasmacomponents3/Label.qml               |  2 +-
 .../plasmacomponents3/Menu.qml                |  4 +-
 .../plasmacomponents3/MenuItem.qml            |  2 +-
 .../plasmacomponents3/Popup.qml               |  2 +-
 .../plasmacomponents3/ProgressBar.qml         |  2 +-
 .../plasmacomponents3/RadioButton.qml         |  4 +-
 .../plasmacomponents3/RadioDelegate.qml       |  2 +-
 .../plasmacomponents3/RangeSlider.qml         |  2 +-
 .../plasmacomponents3/ScrollBar.qml           |  2 +-
 .../plasmacomponents3/Slider.qml              |  2 +-
 .../plasmacomponents3/SpinBox.qml             |  4 +-
 .../plasmacomponents3/Switch.qml              |  4 +-
 .../plasmacomponents3/SwitchDelegate.qml      |  2 +-
 .../plasmacomponents3/TabBar.qml              |  2 +-
 .../plasmacomponents3/TabButton.qml           |  4 +-
 .../plasmacomponents3/TextArea.qml            |  4 +-
 .../plasmacomponents3/TextField.qml           |  4 +-
 .../plasmacomponents3/ToolBar.qml             |  2 +-
 .../plasmacomponents3/ToolButton.qml          |  2 +-
 .../plasmacomponents3/ToolTip.qml             |  2 +-
 .../private/DefaultListItemBackground.qml     |  1 -
 37 files changed, 97 insertions(+), 79 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e3884c1e..c578689e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ endif()
 
 set (REQUIRED_QT_VERSION 5.7.0)
 
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Gui Sql Qml Svg)
+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Gui Sql Qml Svg QuickControls2)
 
 find_package(KF5 ${KF5_DEP_VERSION} REQUIRED
     COMPONENTS
diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt
index 8ac236239..60c1eea49 100644
--- a/src/declarativeimports/CMakeLists.txt
+++ b/src/declarativeimports/CMakeLists.txt
@@ -11,43 +11,62 @@ install(DIRECTORY kirigamiplasmastyle/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde
 
 install(DIRECTORY kirigamiplasmadesktopstyle/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2/styles/org.kde.desktop.plasma)
 
+
+math(EXPR QQC2_VERSION "${Qt5QuickControls2_VERSION_MINOR} - 7")
+set(QQC2_VERSION "2.${QQC2_VERSION}")
+
+
+# Find all the source qml files
+FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/plasmacomponents3/*")
+
+    #for each file, replace @QQC2_VERSION@ with the version we found
+FOREACH(infileName ${inFiles})
+    configure_package_config_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/${infileName}"
+        "${CMAKE_CURRENT_BINARY_DIR}/${infileName}"
+        INSTALL_DESTINATION  "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Plasma"
+        PATH_VARS  QQC2_VERSION
+    )
+ENDFOREACH(infileName)
+
 #install the components as a QQC2 Style, as style for applications (mainly for Plasma Mobile)
-install(DIRECTORY plasmacomponents3/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/Plasma PATTERN qmldir EXCLUDE)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/Plasma)
 
 #install some of the componets as a separate import, to be used in plasmoids (some of them like ApplicationWindow are of no use for plasmoids)
-install(FILES plasmacomponents3/BusyIndicator.qml
-    plasmacomponents3/Button.qml
-    plasmacomponents3/CheckBox.qml
-    plasmacomponents3/CheckDelegate.qml
-    plasmacomponents3/CheckIndicator.qml
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/BusyIndicator.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Button.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckBox.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckDelegate.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckIndicator.qml
     #combobox is not in a new window, but maybe better already than the broken qqc1 combobox?
-    plasmacomponents3/ComboBox.qml
-    plasmacomponents3/Container.qml
-    plasmacomponents3/Control.qml
-    plasmacomponents3/Dial.qml
-    plasmacomponents3/Frame.qml
-    plasmacomponents3/GroupBox.qml
-    plasmacomponents3/ItemDelegate.qml
-    plasmacomponents3/Label.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ComboBox.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Container.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Control.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Dial.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Frame.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/GroupBox.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ItemDelegate.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Label.qml
 
-    plasmacomponents3/ProgressBar.qml
-    plasmacomponents3/RadioButton.qml
-    plasmacomponents3/RadioDelegate.qml
-    plasmacomponents3/RadioIndicator.qml
-    plasmacomponents3/RangeSlider.qml
-    plasmacomponents3/ScrollBar.qml
-    plasmacomponents3/Slider.qml
-    plasmacomponents3/SpinBox.qml
-    plasmacomponents3/Switch.qml
-    plasmacomponents3/SwitchDelegate.qml
-    plasmacomponents3/SwitchIndicator.qml
-    plasmacomponents3/TabBar.qml
-    plasmacomponents3/TabButton.qml
-    plasmacomponents3/TextArea.qml
-    plasmacomponents3/TextField.qml
-    plasmacomponents3/ToolBar.qml
-    plasmacomponents3/ToolButton.qml
-    plasmacomponents3/qmldir
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ProgressBar.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioButton.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioDelegate.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioIndicator.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RangeSlider.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ScrollBar.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Slider.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SpinBox.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Switch.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchDelegate.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchIndicator.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabBar.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabButton.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextArea.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextField.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolBar.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolButton.qml
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/qmldir
 
     DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3)
 install(DIRECTORY plasmacomponents3/private DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3)
diff --git a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
index da421776c..7ff8a1657 100644
--- a/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml
@@ -19,7 +19,7 @@
 */
 
 import QtQuick 2.2
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.BusyIndicator {
diff --git a/src/declarativeimports/plasmacomponents3/Button.qml b/src/declarativeimports/plasmacomponents3/Button.qml
index 428101f88..9ffa63e5d 100644
--- a/src/declarativeimports/plasmacomponents3/Button.qml
+++ b/src/declarativeimports/plasmacomponents3/Button.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml
index 7f5e8f765..04e90ae50 100644
--- a/src/declarativeimports/plasmacomponents3/CheckBox.qml
+++ b/src/declarativeimports/plasmacomponents3/CheckBox.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.CheckBox {
diff --git a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
index f4a9c0fac..50ab5bd94 100644
--- a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
+++ b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private"
 
diff --git a/src/declarativeimports/plasmacomponents3/ComboBox.qml b/src/declarativeimports/plasmacomponents3/ComboBox.qml
index 0d8e019b6..bbfb1d8d0 100644
--- a/src/declarativeimports/plasmacomponents3/ComboBox.qml
+++ b/src/declarativeimports/plasmacomponents3/ComboBox.qml
@@ -19,8 +19,8 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.2
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0 as Controls
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@ as Controls
 import QtGraphicalEffects 1.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
diff --git a/src/declarativeimports/plasmacomponents3/Container.qml b/src/declarativeimports/plasmacomponents3/Container.qml
index 5247cdd75..e14e0556e 100644
--- a/src/declarativeimports/plasmacomponents3/Container.qml
+++ b/src/declarativeimports/plasmacomponents3/Container.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 
 T.Container {
     id: control
diff --git a/src/declarativeimports/plasmacomponents3/Control.qml b/src/declarativeimports/plasmacomponents3/Control.qml
index d2cceacb5..3882aa291 100644
--- a/src/declarativeimports/plasmacomponents3/Control.qml
+++ b/src/declarativeimports/plasmacomponents3/Control.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 
 T.Control {
     id: control
diff --git a/src/declarativeimports/plasmacomponents3/Dial.qml b/src/declarativeimports/plasmacomponents3/Dial.qml
index 0729ce3d8..7589d8ef6 100644
--- a/src/declarativeimports/plasmacomponents3/Dial.qml
+++ b/src/declarativeimports/plasmacomponents3/Dial.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/Dialog.qml b/src/declarativeimports/plasmacomponents3/Dialog.qml
index 373a6f8b2..6b505a3a7 100644
--- a/src/declarativeimports/plasmacomponents3/Dialog.qml
+++ b/src/declarativeimports/plasmacomponents3/Dialog.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Dialog {
diff --git a/src/declarativeimports/plasmacomponents3/DialogButtonBox.qml b/src/declarativeimports/plasmacomponents3/DialogButtonBox.qml
index a9e375138..227c0d5e7 100644
--- a/src/declarativeimports/plasmacomponents3/DialogButtonBox.qml
+++ b/src/declarativeimports/plasmacomponents3/DialogButtonBox.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.DialogButtonBox {
diff --git a/src/declarativeimports/plasmacomponents3/Drawer.qml b/src/declarativeimports/plasmacomponents3/Drawer.qml
index 36ddafd5f..8dda065d2 100644
--- a/src/declarativeimports/plasmacomponents3/Drawer.qml
+++ b/src/declarativeimports/plasmacomponents3/Drawer.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Drawer {
diff --git a/src/declarativeimports/plasmacomponents3/Frame.qml b/src/declarativeimports/plasmacomponents3/Frame.qml
index f9617e5cc..edf64229d 100644
--- a/src/declarativeimports/plasmacomponents3/Frame.qml
+++ b/src/declarativeimports/plasmacomponents3/Frame.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Frame {
diff --git a/src/declarativeimports/plasmacomponents3/GroupBox.qml b/src/declarativeimports/plasmacomponents3/GroupBox.qml
index 6eee9deee..591192e9b 100644
--- a/src/declarativeimports/plasmacomponents3/GroupBox.qml
+++ b/src/declarativeimports/plasmacomponents3/GroupBox.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.GroupBox {
diff --git a/src/declarativeimports/plasmacomponents3/ItemDelegate.qml b/src/declarativeimports/plasmacomponents3/ItemDelegate.qml
index 965fff13a..98d3e4533 100644
--- a/src/declarativeimports/plasmacomponents3/ItemDelegate.qml
+++ b/src/declarativeimports/plasmacomponents3/ItemDelegate.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private"
 
diff --git a/src/declarativeimports/plasmacomponents3/Label.qml b/src/declarativeimports/plasmacomponents3/Label.qml
index 2a56213a3..630918083 100644
--- a/src/declarativeimports/plasmacomponents3/Label.qml
+++ b/src/declarativeimports/plasmacomponents3/Label.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.1
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Label {
diff --git a/src/declarativeimports/plasmacomponents3/Menu.qml b/src/declarativeimports/plasmacomponents3/Menu.qml
index 7878b0b92..c6b7b9b49 100644
--- a/src/declarativeimports/plasmacomponents3/Menu.qml
+++ b/src/declarativeimports/plasmacomponents3/Menu.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Menu {
diff --git a/src/declarativeimports/plasmacomponents3/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml
index c286f1106..555763d04 100644
--- a/src/declarativeimports/plasmacomponents3/MenuItem.qml
+++ b/src/declarativeimports/plasmacomponents3/MenuItem.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.MenuItem {
diff --git a/src/declarativeimports/plasmacomponents3/Popup.qml b/src/declarativeimports/plasmacomponents3/Popup.qml
index d698d4105..ec6d91846 100644
--- a/src/declarativeimports/plasmacomponents3/Popup.qml
+++ b/src/declarativeimports/plasmacomponents3/Popup.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Popup {
diff --git a/src/declarativeimports/plasmacomponents3/ProgressBar.qml b/src/declarativeimports/plasmacomponents3/ProgressBar.qml
index db8a75c3f..28c33ed78 100644
--- a/src/declarativeimports/plasmacomponents3/ProgressBar.qml
+++ b/src/declarativeimports/plasmacomponents3/ProgressBar.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.ProgressBar {
diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
index d22be5099..bf495688b 100644
--- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.RadioButton {
diff --git a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
index f95df897f..df732d4ce 100644
--- a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private"
 
diff --git a/src/declarativeimports/plasmacomponents3/RangeSlider.qml b/src/declarativeimports/plasmacomponents3/RangeSlider.qml
index f61bb3517..f80d8deef 100644
--- a/src/declarativeimports/plasmacomponents3/RangeSlider.qml
+++ b/src/declarativeimports/plasmacomponents3/RangeSlider.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/ScrollBar.qml b/src/declarativeimports/plasmacomponents3/ScrollBar.qml
index aa0a6cfc0..08a8f3796 100644
--- a/src/declarativeimports/plasmacomponents3/ScrollBar.qml
+++ b/src/declarativeimports/plasmacomponents3/ScrollBar.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.2 as Kirigami
 
diff --git a/src/declarativeimports/plasmacomponents3/Slider.qml b/src/declarativeimports/plasmacomponents3/Slider.qml
index c499cebe9..90946ea60 100644
--- a/src/declarativeimports/plasmacomponents3/Slider.qml
+++ b/src/declarativeimports/plasmacomponents3/Slider.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/SpinBox.qml b/src/declarativeimports/plasmacomponents3/SpinBox.qml
index e48798a6d..b1eaf749c 100644
--- a/src/declarativeimports/plasmacomponents3/SpinBox.qml
+++ b/src/declarativeimports/plasmacomponents3/SpinBox.qml
@@ -1,8 +1,8 @@
 
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@ 
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml
index 333070e71..17e672298 100644
--- a/src/declarativeimports/plasmacomponents3/Switch.qml
+++ b/src/declarativeimports/plasmacomponents3/Switch.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
-import QtQuick.Controls 2.0
+import QtQuick.Templates @QQC2_VERSION@ as T
+import QtQuick.Controls @QQC2_VERSION@
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.Switch {
diff --git a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
index 8985d71f5..a6a079718 100644
--- a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
+++ b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.5
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private"
 
diff --git a/src/declarativeimports/plasmacomponents3/TabBar.qml b/src/declarativeimports/plasmacomponents3/TabBar.qml
index cc2b307b4..ef547892f 100644
--- a/src/declarativeimports/plasmacomponents3/TabBar.qml
+++ b/src/declarativeimports/plasmacomponents3/TabBar.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.TabBar {
diff --git a/src/declarativeimports/plasmacomponents3/TabButton.qml b/src/declarativeimports/plasmacomponents3/TabButton.qml
index 0383f0fce..61ec49863 100644
--- a/src/declarativeimports/plasmacomponents3/TabButton.qml
+++ b/src/declarativeimports/plasmacomponents3/TabButton.qml
@@ -18,9 +18,9 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick.Controls @QQC2_VERSION@
 import QtQml.Models 2.1
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.TabButton {
diff --git a/src/declarativeimports/plasmacomponents3/TextArea.qml b/src/declarativeimports/plasmacomponents3/TextArea.qml
index 0fd1458ce..861d02203 100644
--- a/src/declarativeimports/plasmacomponents3/TextArea.qml
+++ b/src/declarativeimports/plasmacomponents3/TextArea.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/TextField.qml b/src/declarativeimports/plasmacomponents3/TextField.qml
index 2fc5c9e31..dabcbe010 100644
--- a/src/declarativeimports/plasmacomponents3/TextField.qml
+++ b/src/declarativeimports/plasmacomponents3/TextField.qml
@@ -18,8 +18,8 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls @QQC2_VERSION@
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/ToolBar.qml b/src/declarativeimports/plasmacomponents3/ToolBar.qml
index d43f64403..3b236558f 100644
--- a/src/declarativeimports/plasmacomponents3/ToolBar.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolBar.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.ToolBar {
diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml
index 61d5cfd13..11d92559c 100644
--- a/src/declarativeimports/plasmacomponents3/ToolButton.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "private" as Private
 
diff --git a/src/declarativeimports/plasmacomponents3/ToolTip.qml b/src/declarativeimports/plasmacomponents3/ToolTip.qml
index 8268acf36..656a108ed 100644
--- a/src/declarativeimports/plasmacomponents3/ToolTip.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolTip.qml
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Templates 2.0 as T
+import QtQuick.Templates @QQC2_VERSION@ as T
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 T.ToolTip {
diff --git a/src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml b/src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml
index 96ecba023..ff73fd754 100644
--- a/src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml
+++ b/src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml
@@ -19,7 +19,6 @@
 
 import QtQuick 2.1
 //for Settings
-import QtQuick.Controls 1.0 as Controls
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.2 as Kirigami