aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-04-21 10:39:48 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-02 15:16:18 +0200
commitc1b0c9f546289b1592d7a895640de103723a0305 (patch)
treef702cf6e7f3ccff9dc6ff38360dda80ec0cdca0d
parent802b395222054f39501f1e02879d5c708b3da8d9 (diff)
qt5: add one more subfolder for ${PN}-qmldesigner
QtQuickControls2 has deeper folder structure, make sure that files go to correct packages. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qt5.inc1
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
2 files changed, 1 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index f9cb2b47..b066dded 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -92,6 +92,7 @@ FILES_${PN}-plugins-dbg = " \
FILES_${PN}-qmldesigner += " \
${OE_QMAKE_PATH_QML}/*/designer \
${OE_QMAKE_PATH_QML}/*/*/designer \
+ ${OE_QMAKE_PATH_QML}/*/*/*/designer \
"
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index e3c580fe..0ebf4fd5 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,6 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative"
-FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
-
SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0"