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>2017-08-10 02:08:29 +0200
commitf8584d7a7c90afc71484a40279aa3df651d0e04f (patch)
treef4676d0363d9bb5be78f4a358a19d59295d2f0f1
parent1100037b9becaaa5749602bca9d63693119c4585 (diff)
qt5: add one more subfolder for ${PN}-qmldesigner
QtQuickControls2 has deeper folder structure, make sure that files go to correct packages. Change-Id: Ibdbd9b8e15a49acbc70195786fc960400bbb2bf0 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 32053e45..f481691c 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 = "e93c73c0aa15cd973e008a04a70a7c69719ad244"