[oe-commits] Holger Hans Peter Freyther : qtwebkit-performance-utilities.inc: Use += to not undo qt4e

git version control git at git.openembedded.org
Fri Jan 15 00:17:12 UTC 2010


Module: openembedded.git
Branch: shr/merge
Commit: e0ce766db26233fdd16c85e9b3008a17596b17ec
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e0ce766db26233fdd16c85e9b3008a17596b17ec

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Mon Jan 11 13:58:31 2010 +0100

qtwebkit-performance-utilities.inc: Use += to not undo qt4e

Append to the extra qmake variables instead of assigning it. This
means that the original qt4e extra variables will be passed to qmake
and we will link to the QtE libraries again.

---

 recipes/webkit/qtwebkit-performance-utilities.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/webkit/qtwebkit-performance-utilities.inc b/recipes/webkit/qtwebkit-performance-utilities.inc
index 9041a28..1fc7edb 100644
--- a/recipes/webkit/qtwebkit-performance-utilities.inc
+++ b/recipes/webkit/qtwebkit-performance-utilities.inc
@@ -7,7 +7,7 @@ SRC_URI = "git://gitorious.org/qtwebkit/performance.git;protocol=git"
 S = "${WORKDIR}/git"
 PV = "0.1+gitr${SRCREV}"
 
-EXTRA_QMAKEVARS_PRE = "INSTALL_DIR=${bindir}"
+EXTRA_QMAKEVARS_PRE += "INSTALL_DIR=${bindir}"
 
 FILES_${PN} = "${bindir}/qtwebkit-benchmark/*"
 FILES_${PN}-dbg = "${bindir}/qtwebkit-benchmark/.debug/*"





More information about the Openembedded-commits mailing list