diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-04-17 20:50:36 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-18 11:30:47 +0000 |
commit | 8124b3c768f8e539d6cbe670d6caca132415f435 (patch) | |
tree | 20f25e688d49c0374d6b2d0bf41bfbc5178992ed | |
parent | d5f472661eded1aa26b19e1e8d10149cb7ace59f (diff) | |
download | meta-qt5-8124b3c768f8e539d6cbe670d6caca132415f435.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-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 5 |
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 f5446afd..d899ff94 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 | qtcharts-dev \ | 49 | qtcharts-dev \ |
51 | qtcharts-mkspecs \ | 50 | qtcharts-mkspecs \ |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 95357374..a8c71668 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 | ||
86 | FILES_${PN}-qtconfig = " \ | ||
87 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtconfig_*.qm \ | ||
88 | " | ||
89 | |||
90 | FILES_${PN}-qtquick1 = " \ | 85 | FILES_${PN}-qtquick1 = " \ |
91 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ | 86 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ |
92 | " | 87 | " |