projects
/
scm
/
bb
/
tizen-distro.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b253575
)
qtbase: don't touch STAGING_DATADIR
author
Martin Jansa
<Martin.Jansa@gmail.com>
Wed, 19 Dec 2012 16:53:14 +0000
(17:53 +0100)
committer
Patrick Ohly
<patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:43:41 +0000
(08:43 -0800)
(From meta-qt5 rev:
1ecc46ac42a685057c94e1bd30147ea81ab925bf
)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-qt5/recipes-qt/qt5/qtbase.inc
patch
|
blob
|
history
diff --git
a/meta-qt5/recipes-qt/qt5/qtbase.inc
b/meta-qt5/recipes-qt/qt5/qtbase.inc
index
2784465
..
4b39791
100644
(file)
--- a/
meta-qt5/recipes-qt/qt5/qtbase.inc
+++ b/
meta-qt5/recipes-qt/qt5/qtbase.inc
@@
-56,7
+56,6
@@
do_configure_append() {
### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib
${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR}
sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf
- sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf
### Remove the old pri files
rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri