aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-22 10:53:08 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-23 12:37:31 +0000
commitcaa42afa5d4d9188a66b7c4d004f29eb4eb0fb04 (patch)
tree9a532f2bd925a3b10945e1d69f6c7c2ba5e4cb3d
parentd6345ffef3ec69ec766241c7bd4f15e5617ac9e6 (diff)
Fix .impl imports
The .impl imports are not standalone modules. Make sure all .impl imports are paired with an import that registers the .impl namespace. The issue was exposed by an unrelated change, which suddenly made tst_accessibility:RadioButton fail. Change-Id: I6fe7c33d52c52f9153d9c8c99a9bd256471fb6b0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r--src/imports/controls/CheckBox.qml1
-rw-r--r--src/imports/controls/CheckDelegate.qml1
-rw-r--r--src/imports/controls/Dial.qml1
-rw-r--r--src/imports/controls/ProgressBar.qml1
-rw-r--r--src/imports/controls/RadioButton.qml1
-rw-r--r--src/imports/controls/RadioDelegate.qml2
-rw-r--r--src/imports/controls/Switch.qml1
-rw-r--r--src/imports/controls/SwitchDelegate.qml1
8 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index ec0025bc..3615948a 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
T.CheckBox {
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index 0296f0c5..dcef7f77 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
T.CheckDelegate {
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index a3dfff08..55fd7a4b 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -35,6 +35,7 @@
****************************************************************************/
import QtQuick 2.6
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index 6de9e1cc..fb312b18 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
T.ProgressBar {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 11e2ca7a..8a2d7c99 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Controls 2.0
+import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
T.RadioButton {
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index 6fb7c4f6..d745054a 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -35,6 +35,8 @@
****************************************************************************/
import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Controls.impl 2.0
import QtQuick.Templates 2.0 as T
T.RadioDelegate {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 1b77e25f..0810626f 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
T.Switch {
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index caf8e9e1..430fc8ec 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -36,6 +36,7 @@
import QtQuick 2.6
import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.0
import QtQuick.Controls.impl 2.0
T.SwitchDelegate {