aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@qt.io>2020-11-13 15:46:54 +0100
committerFawzi Mohamed <fawzi.mohamed@qt.io>2020-11-18 08:13:20 +0100
commita3253c37903e95706f011bc03093160236b57bdc (patch)
treee5694503c67fce5c8acaa00f1a9ebe84b05c9acc /src/imports
parent42f96656e948335093cbbaa5d5debf5db5353c31 (diff)
Add QtQuick.Layout dependency to native style qmldir
Without it qmlimportscanner misses the dependency of FocusFrame.qml and static builds fail to add the dependency leading to a QComponent is not ready error. This happens because the qml file is in a qrc, and thus not visible to qmlimportscanner. Adding a depends QtQuick.Layouts fixes it (and updating the controls dependency to drop the version) Fixes: QTBUG-88492 Change-Id: I9be3e26c3a03b663cb90618368f3480f141a6b04 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/nativestyle/qmldir3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/nativestyle/qmldir b/src/imports/nativestyle/qmldir
index 4a0f3738..06914fd3 100644
--- a/src/imports/nativestyle/qmldir
+++ b/src/imports/nativestyle/qmldir
@@ -1,7 +1,8 @@
module QtQuick.NativeStyle
plugin qtquickcontrols2nativestyleplugin
classname QtQuickControls2NativeStylePlugin
-depends QtQuick.Controls 2.5
+depends QtQuick.Controls
+depends QtQuick.Layouts
DefaultButton 2.0 controls/DefaultButton.qml
DefaultButton 6.0 controls/DefaultButton.qml