diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-27 11:53:40 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-04-27 10:26:49 +0000 |
commit | 3d9c554e66f2e6f6eaf8b94d6b1e2bfb34eeae0a (patch) | |
tree | aee1024ad8514b0f89149d9ff3848ece09ad464f | |
parent | 95f123a60a97428237164f96672b0c11c539efed (diff) | |
download | meta-qt5-3d9c554e66f2e6f6eaf8b94d6b1e2bfb34eeae0a.tar.gz |
qt5: include compiled .jsc cache files to qmlplugins
Change-Id: I952df9eed39ff5aae174fe6b45e9895e49b41624
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 6f925244..4b5fe8a8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -97,7 +97,7 @@ FILES_${PN}-qmldesigner += " \ | |||
97 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ | 97 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ |
98 | " | 98 | " |
99 | 99 | ||
100 | # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*js} | 100 | # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc} |
101 | FILES_${PN}-qmlplugins = " \ | 101 | FILES_${PN}-qmlplugins = " \ |
102 | ${OE_QMAKE_PATH_QML}/*.qmltypes \ | 102 | ${OE_QMAKE_PATH_QML}/*.qmltypes \ |
103 | ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ | 103 | ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ |
@@ -106,6 +106,7 @@ FILES_${PN}-qmlplugins = " \ | |||
106 | ${OE_QMAKE_PATH_QML}/*/*.qml \ | 106 | ${OE_QMAKE_PATH_QML}/*/*.qml \ |
107 | ${OE_QMAKE_PATH_QML}/*/*.qmlc \ | 107 | ${OE_QMAKE_PATH_QML}/*/*.qmlc \ |
108 | ${OE_QMAKE_PATH_QML}/*/*.js \ | 108 | ${OE_QMAKE_PATH_QML}/*/*.js \ |
109 | ${OE_QMAKE_PATH_QML}/*/*.jsc \ | ||
109 | ${OE_QMAKE_PATH_QML}/*/*.png \ | 110 | ${OE_QMAKE_PATH_QML}/*/*.png \ |
110 | ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ | 111 | ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ |
111 | ${OE_QMAKE_PATH_QML}/*/*/qmldir \ | 112 | ${OE_QMAKE_PATH_QML}/*/*/qmldir \ |
@@ -113,6 +114,7 @@ FILES_${PN}-qmlplugins = " \ | |||
113 | ${OE_QMAKE_PATH_QML}/*/*/*.qml \ | 114 | ${OE_QMAKE_PATH_QML}/*/*/*.qml \ |
114 | ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \ | 115 | ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \ |
115 | ${OE_QMAKE_PATH_QML}/*/*/*.js \ | 116 | ${OE_QMAKE_PATH_QML}/*/*/*.js \ |
117 | ${OE_QMAKE_PATH_QML}/*/*/*.jsc \ | ||
116 | ${OE_QMAKE_PATH_QML}/*/*/*.png \ | 118 | ${OE_QMAKE_PATH_QML}/*/*/*.png \ |
117 | ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ | 119 | ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ |
118 | ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ | 120 | ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ |
@@ -121,6 +123,7 @@ FILES_${PN}-qmlplugins = " \ | |||
121 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ | 123 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ |
122 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \ | 124 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \ |
123 | ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ | 125 | ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ |
126 | ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \ | ||
124 | ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ | 127 | ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ |
125 | ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ | 128 | ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ |
126 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ | 129 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ |
@@ -129,6 +132,7 @@ FILES_${PN}-qmlplugins = " \ | |||
129 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ | 132 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ |
130 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \ | 133 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \ |
131 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ | 134 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ |
135 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \ | ||
132 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ | 136 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ |
133 | ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ | 137 | ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ |
134 | ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ | 138 | ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 439552f7..3612011b 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -19,12 +19,6 @@ RDEPENDS_${PN}-dev = "" | |||
19 | 19 | ||
20 | FILES_${PN}-qmlplugins += " \ | 20 | FILES_${PN}-qmlplugins += " \ |
21 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ | 21 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ |
22 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/* \ | ||
23 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+hlsl \ | ||
24 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+hlsl/* \ | ||
25 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+glslcore \ | ||
26 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders/+glslcore/* \ | ||
27 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Private/*.jsc \ | ||
28 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 22 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
29 | " | 23 | " |
30 | 24 | ||