diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-08-29 19:03:59 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-09-13 14:07:23 +0200 |
| commit | 284020d9344b6fbd88d9c6d5ff6fbaef430a775b (patch) | |
| tree | a1870b9eae61607a1ecc31738a586c6fbf16bdb8 | |
| parent | 2868f1a1838ab6a893fd01a05e61d582640a056d (diff) | |
qtwebkit: remove examples packages
* fixes:
NOTE: multiple providers are available for runtime qtwebkit-examples (qtwebkit-examples, qtwebkit)
NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples
NOTE: multiple providers are available for runtime qtwebkit-examples-dev (qtwebkit, qtwebkit-examples)
NOTE: consider defining a PREFERRED_PROVIDER entry to match qtwebkit-examples-dev
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 14a4e7a1..75492d58 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc @@ -11,6 +11,9 @@ DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" +# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe +PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " + do_configure_append() { # Fix rpaths for QtWebProcess find -name "Makefile*" | xargs sed -i "s|-Wl,-rpath,${B}/lib||g" |