diff options
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator_4.5.1.bb | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 39 |
4 files changed, 2 insertions, 51 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index db26afbb..5bea3c89 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -55,7 +55,7 @@ SRC_URI += " \ | |||
55 | file://OEQt5Toolchain.cmake \ | 55 | file://OEQt5Toolchain.cmake \ |
56 | " | 56 | " |
57 | 57 | ||
58 | PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" | 58 | PACKAGES = "${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" |
59 | 59 | ||
60 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 60 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |
61 | 61 | ||
@@ -71,11 +71,6 @@ FILES_${PN}-tools-staticdev = " \ | |||
71 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 71 | ${OE_QMAKE_PATH_LIBS}/*.a \ |
72 | " | 72 | " |
73 | 73 | ||
74 | FILES_${PN}-tools-dbg = " \ | ||
75 | ${libdir}/.debug \ | ||
76 | ${OE_QMAKE_PATH_BINS}/.debug \ | ||
77 | " | ||
78 | |||
79 | FILES_${PN}-tools = " \ | 74 | FILES_${PN}-tools = " \ |
80 | ${libdir}/lib*${SOLIBS} \ | 75 | ${libdir}/lib*${SOLIBS} \ |
81 | ${OE_QMAKE_PATH_BINS}/* \ | 76 | ${OE_QMAKE_PATH_BINS}/* \ |
diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb index 4c26ac49..08d8289d 100644 --- a/recipes-qt/qt5/qt5-creator_4.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb | |||
@@ -59,12 +59,6 @@ FILES_${PN} += " \ | |||
59 | ${datadir}/icons \ | 59 | ${datadir}/icons \ |
60 | ${libdir}${QT_DIR_NAME}/qtcreator \ | 60 | ${libdir}${QT_DIR_NAME}/qtcreator \ |
61 | " | 61 | " |
62 | FILES_${PN}-dbg += " \ | ||
63 | ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ | ||
64 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ | ||
65 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ | ||
66 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ | ||
67 | " | ||
68 | 62 | ||
69 | FILES_${PN}-dev += " \ | 63 | FILES_${PN}-dev += " \ |
70 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 64 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ |
diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb index 383145be..d359db99 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | |||
@@ -23,5 +23,4 @@ S = "${WORKDIR}/git/vboxtouch" | |||
23 | inherit qmake5 | 23 | inherit qmake5 |
24 | 24 | ||
25 | FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" | 25 | FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" |
26 | FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/generic/.debug/" | ||
27 | FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" | 26 | FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" |
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 99105bd9..4b9476c6 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -49,13 +49,11 @@ python __anonymous() { | |||
49 | # suppress QA check complaining | 49 | # suppress QA check complaining |
50 | INSANE_SKIP_${PN}-dbg += "libdir" | 50 | INSANE_SKIP_${PN}-dbg += "libdir" |
51 | INSANE_SKIP_${PN}-examples += "libdir" | 51 | INSANE_SKIP_${PN}-examples += "libdir" |
52 | INSANE_SKIP_${PN}-examples-dbg += "libdir" | ||
53 | INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" | 52 | INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" |
54 | 53 | ||
55 | PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " | 54 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples " |
56 | 55 | ||
57 | ALLOW_EMPTY_${PN} = "1" | 56 | ALLOW_EMPTY_${PN} = "1" |
58 | ALLOW_EMPTY_${PN}-dbg = "1" | ||
59 | ALLOW_EMPTY_${PN}-plugins = "1" | 57 | ALLOW_EMPTY_${PN}-plugins = "1" |
60 | ALLOW_EMPTY_${PN}-qmlplugins = "1" | 58 | ALLOW_EMPTY_${PN}-qmlplugins = "1" |
61 | 59 | ||
@@ -71,27 +69,6 @@ RRECOMMENDS_${PN}-dev = " \ | |||
71 | ${PN}-qmldesigner \ | 69 | ${PN}-qmldesigner \ |
72 | " | 70 | " |
73 | 71 | ||
74 | RRECOMMENDS_${PN}-dbg = " \ | ||
75 | ${PN}-plugins-dbg \ | ||
76 | ${PN}-qmlplugins-dbg \ | ||
77 | " | ||
78 | |||
79 | # extra -dbg packages | ||
80 | FILES_${PN}-qmlplugins-dbg = " \ | ||
81 | ${OE_QMAKE_PATH_QML}/*/.debug \ | ||
82 | ${OE_QMAKE_PATH_QML}/*/*/.debug \ | ||
83 | ${OE_QMAKE_PATH_QML}/*/*/*/.debug \ | ||
84 | ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ | ||
85 | " | ||
86 | FILES_${PN}-tools-dbg = " \ | ||
87 | ${OE_QMAKE_PATH_BINS}/.debug \ | ||
88 | " | ||
89 | FILES_${PN}-plugins-dbg = " \ | ||
90 | ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \ | ||
91 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ | ||
92 | ${OE_QMAKE_PATH_PLUGINS}/*/*/*/.debug/* \ | ||
93 | " | ||
94 | |||
95 | # extra packages | 72 | # extra packages |
96 | FILES_${PN}-qmldesigner += " \ | 73 | FILES_${PN}-qmldesigner += " \ |
97 | ${OE_QMAKE_PATH_QML}/*/designer \ | 74 | ${OE_QMAKE_PATH_QML}/*/designer \ |
@@ -163,10 +140,6 @@ FILES_${PN}-dev += " \ | |||
163 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 140 | ${OE_QMAKE_PATH_LIBS}/*.la \ |
164 | ${OE_QMAKE_PATH_HEADERS}/* \ | 141 | ${OE_QMAKE_PATH_HEADERS}/* \ |
165 | " | 142 | " |
166 | FILES_${PN}-dbg += " \ | ||
167 | ${OE_QMAKE_PATH_LIBS}/.debug \ | ||
168 | ${OE_QMAKE_PATH_LIBEXECS}/.debug \ | ||
169 | " | ||
170 | FILES_${PN}-staticdev += " \ | 143 | FILES_${PN}-staticdev += " \ |
171 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 144 | ${OE_QMAKE_PATH_LIBS}/*.a \ |
172 | ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ | 145 | ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ |
@@ -195,16 +168,6 @@ FILES_${PN}-examples-dev = " \ | |||
195 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ | 168 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ |
196 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ | 169 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ |
197 | " | 170 | " |
198 | FILES_${PN}-examples-dbg = " \ | ||
199 | ${OE_QMAKE_PATH_EXAMPLES}/.debug \ | ||
200 | ${OE_QMAKE_PATH_EXAMPLES}/*/.debug \ | ||
201 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/.debug \ | ||
202 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \ | ||
203 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \ | ||
204 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \ | ||
205 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/.debug \ | ||
206 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/.debug \ | ||
207 | " | ||
208 | FILES_${PN}-examples-staticdev = " \ | 171 | FILES_${PN}-examples-staticdev = " \ |
209 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ | 172 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ |
210 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ | 173 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ |