Merge pull request #12 from aebruno/fix-sdk-build

Fix SDK build errors.

Merge pull request #12 from aebruno/fix-sdk-build
Fix SDK build errors.
cf71185e · Florent Revest · GitHub · d62eff58 · 86774d47 · cf71185e
Commit cf71185e authored Jan 11, 2017 by Florent Revest Committed by GitHub Jan 11, 2017
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

packagegroup-qt5-toolchain-target.bbappend .../packagegroups/packagegroup-qt5-toolchain-target.bbappend +17 -0

qtwebkit_git.bbappend recipes-qt/qt5/qtwebkit_git.bbappend +1 -0

No files found.
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+
+USE_RUBY = " \
+    qtquick1-dev \
+    qttranslations-qtquick1 \
+    qtwebkit-dev \
+    qtwebkit-mkspecs \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \
+"
+
+RDEPENDS_${PN}_remove = "qtmultimedia-plugins"
+RDEPENDS_${PN}_remove = "qttools-mkspecs"
+RDEPENDS_${PN}_remove = "qttools-staticdev"
+
+RDEPENDS_${PN} += " \
+    mapplauncherd-qt \
+    qtquick1 \
+"
--- a/recipes-qt/qt5/qtwebkit_git.bbappend
+++ b/recipes-qt/qt5/qtwebkit_git.bbappend
+EXTRA_QMAKEVARS_PRE += "QMAKE_CFLAGS_ISYSTEM="