aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-26 15:26:06 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-26 13:42:47 +0000
commita11fd7e42ffab86b001b755ba68b6fea3f883bae (patch)
treef1dbb762baaa60bcf8882d84a05775c5ab59b1b7
parent27eb4f5683d9fe1426d3d3b51cb3c7f2b74082a6 (diff)
styles.qrc: Remove qmldir
If a plugin is used, the qmldir file must be located next to the plugin in the file system. By it being included in the .qrc file it was deployed twice, once in the file system and once in the virtual resource file system. A recent change in declarative ended up doing an implicit import on that virtual directory and thus uncovered this bug of the qmldir file being present in a (virtual) directory where it doesn't belong. qml_module.prf takes care of deploying the qmldir. Task-number: QTBUG-62138 Change-Id: I7693b5656cb593454e2d777fe179e6f889d6dbdf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/virtualkeyboard/styles/styles.qrc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/virtualkeyboard/styles/styles.qrc b/src/virtualkeyboard/styles/styles.qrc
index 39ca357b..819d4771 100644
--- a/src/virtualkeyboard/styles/styles.qrc
+++ b/src/virtualkeyboard/styles/styles.qrc
@@ -4,7 +4,6 @@
<file>KeyIcon.qml</file>
<file>KeyPanel.qml</file>
<file>SelectionListItem.qml</file>
- <file>qmldir</file>
<file>TraceInputKeyPanel.qml</file>
<file>TraceCanvas.qml</file>
<file>TraceUtils.js</file>