summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-04-17 20:50:36 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-20 10:04:04 +0000
commit7a52f924a0298857db99be20aca1484bb2b4e163 (patch)
treef3278b981b6baea142394d8c03767386abb67cf1
parentf48752cc10266ffedee451813ceceec3e67c167f (diff)
downloadmeta-qt5-7a52f924a0298857db99be20aca1484bb2b4e163.tar.gz
packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
It failed to build meta-toolchain-qt5: ... Error: Problem: conflicting requests - nothing provides qttranslations-qtconfig needed by packagegroup-qt5-toolchain-target-1.0-r0.noarch ... The upstream removed qtconfig translations: ... commit a6b3446cb023e7b3a5f8aa12ea0d650d2b804334 Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Thu Sep 14 19:33:25 2017 +0300 Remove qtconfig translations ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb1
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb5
2 files changed, 0 insertions, 6 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 234cde8c..df805146 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -45,7 +45,6 @@ RDEPENDS_${PN} += " \
45 qtbase-staticdev \ 45 qtbase-staticdev \
46 qttranslations-qt \ 46 qttranslations-qt \
47 qttranslations-qtbase \ 47 qttranslations-qtbase \
48 qttranslations-qtconfig \
49 qttranslations-qthelp \ 48 qttranslations-qthelp \
50 qtconnectivity-dev \ 49 qtconnectivity-dev \
51 qtconnectivity-mkspecs \ 50 qtconnectivity-mkspecs \
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 59949cfa..88a390f9 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -22,7 +22,6 @@ PACKAGES =. " \
22 ${PN}-qtwebsockets \ 22 ${PN}-qtwebsockets \
23 ${PN}-qtwebengine \ 23 ${PN}-qtwebengine \
24 ${PN}-qtxmlpatterns \ 24 ${PN}-qtxmlpatterns \
25 ${PN}-qtconfig \
26 ${PN}-qtquick1 \ 25 ${PN}-qtquick1 \
27 ${PN}-qtscript \ 26 ${PN}-qtscript \
28 ${PN}-qtserialport \ 27 ${PN}-qtserialport \
@@ -83,10 +82,6 @@ FILES_${PN}-qtxmlpatterns = " \
83 ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ 82 ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \
84" 83"
85 84
86FILES_${PN}-qtconfig = " \
87 ${OE_QMAKE_PATH_TRANSLATIONS}/qtconfig_*.qm \
88"
89
90FILES_${PN}-qtquick1 = " \ 85FILES_${PN}-qtquick1 = " \
91 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ 86 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \
92" 87"