summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:03:25 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:03:25 +0100
commit0c065b5fdcda26c946df686909c5c08efa9e7d93 (patch)
tree366fe4080030916cd3a9e95279c73f25c3885189
parent641898505bc64db300bd2f6ae0671f6b4f8adce3 (diff)
parent51d28fb6b3dd9f44b9e8c237e860b739e0bf28f3 (diff)
downloadqtquickcontrols-0c065b5fdcda26c946df686909c5c08efa9e7d93.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5dde2484b97c5ef23bd83b377635a86b0441b95f
-rw-r--r--src/controls/qmldir1
-rw-r--r--src/dialogs/qmldir1
-rw-r--r--src/extras/Styles/Flat/qmldir1
-rw-r--r--src/extras/qmldir1
4 files changed, 4 insertions, 0 deletions
diff --git a/src/controls/qmldir b/src/controls/qmldir
index 75f5e24c..6641de86 100644
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
@@ -5,3 +5,4 @@ typeinfo plugins.qmltypes
designersupported
depends QtQuick.Window 2.2
depends QtQuick.Layouts 1.0
+depends QtQml 2.14
diff --git a/src/dialogs/qmldir b/src/dialogs/qmldir
index e94f11dd..88df140e 100644
--- a/src/dialogs/qmldir
+++ b/src/dialogs/qmldir
@@ -7,3 +7,4 @@ depends Qt.labs.settings 1.0
depends QtQuick.Dialogs.Private 1.0
depends QtQuick.Controls 1.3
depends QtQuick.PrivateWidgets 1.1
+depends QtQml 2.14
diff --git a/src/extras/Styles/Flat/qmldir b/src/extras/Styles/Flat/qmldir
index 74a5a967..2fe49220 100644
--- a/src/extras/Styles/Flat/qmldir
+++ b/src/extras/Styles/Flat/qmldir
@@ -1,3 +1,4 @@
module QtQuick.Controls.Styles.Flat
plugin qtquickextrasflatplugin
classname QtQuickExtrasStylesPlugin
+depends QtQml 2.14
diff --git a/src/extras/qmldir b/src/extras/qmldir
index 030a7c2c..0cac6a55 100644
--- a/src/extras/qmldir
+++ b/src/extras/qmldir
@@ -4,3 +4,4 @@ classname QtQuickExtrasPlugin
#typeinfo plugins.qmltypes
depends QtGraphicalEffects 1.0
+depends QtQml 2.14