diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
| commit | 87c1b763147f0dd15e7724fd2a41244dd856613c (patch) | |
| tree | 2212e206ffc9085209776925c3145f1cff8d7493 /src/imports/controls/universal | |
| parent | ea381fba363fcf9b9ef463f24eb90c5e5517fd01 (diff) | |
| parent | 3af18224190d2c008a4ed6fe39b07e60db5dc683 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/universal/CheckDelegate.qml
src/imports/controls/universal/RadioDelegate.qml
src/imports/controls/universal/Switch.qml
src/imports/controls/universal/SwitchDelegate.qml
Change-Id: I9bca4b8d9ce3f6c5c7589daa0ced7d0353f42efc
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/CheckDelegate.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/RadioDelegate.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/Switch.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/SwitchDelegate.qml | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index f35542d0..72edd60f 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -39,6 +39,7 @@ import QtQuick.Templates 2.3 as T import QtQuick.Controls 2.3 import QtQuick.Controls.impl 2.3 import QtQuick.Controls.Universal 2.3 +import QtQuick.Controls.Universal.impl 2.3 T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 32c1aaec..924080f6 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -39,6 +39,7 @@ import QtQuick.Templates 2.3 as T import QtQuick.Controls 2.3 import QtQuick.Controls.impl 2.3 import QtQuick.Controls.Universal 2.3 +import QtQuick.Controls.Universal.impl 2.3 T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index a507a953..2b05d45f 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -37,6 +37,7 @@ import QtQuick 2.9 import QtQuick.Templates 2.3 as T import QtQuick.Controls.Universal 2.3 +import QtQuick.Controls.Universal.impl 2.3 T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index c97d21a0..ec4f37b4 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -39,6 +39,7 @@ import QtQuick.Templates 2.3 as T import QtQuick.Controls 2.3 import QtQuick.Controls.impl 2.3 import QtQuick.Controls.Universal 2.3 +import QtQuick.Controls.Universal.impl 2.3 T.SwitchDelegate { id: control |