diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:05:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:05:32 +0100 |
| commit | 51d28fb6b3dd9f44b9e8c237e860b739e0bf28f3 (patch) | |
| tree | 8ab70e4d04fd99b51879bfef525cc7000fced8e6 | |
| parent | e6182202ba0bb93fa62ce1a54159501823046c37 (diff) | |
| parent | 724c8d81b0ce39ffc32dfdcf1b134ac4befb0127 (diff) | |
| download | qtquickcontrols-51d28fb6b3dd9f44b9e8c237e860b739e0bf28f3.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I1d6fd78aa3b9ef7899a14c95c5e06b2d44458d80
| -rw-r--r-- | src/controls/qmldir | 1 | ||||
| -rw-r--r-- | src/dialogs/qmldir | 1 | ||||
| -rw-r--r-- | src/extras/Styles/Flat/qmldir | 1 | ||||
| -rw-r--r-- | src/extras/qmldir | 1 |
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 |