summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt4-embedded.inc
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-05-08 13:28:30 +0800
committerScott Garman <scott.a.garman@intel.com>2012-05-15 15:20:00 -0700
commit98cb2efe4e9f3092d531c9fc809406c3ef559725 (patch)
tree4924107ce82480beee70ea1a9211b245c7e881d0 /meta/recipes-qt/qt4/qt4-embedded.inc
parent36634e16c0a0c80674bacf20f9841e3b042bd5fd (diff)
downloadopenembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.tar.gz
openembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.tar.bz2
openembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.zip
qt4: move functions from python to shell style
In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] [RP: Fix whitepace] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [SG: Resolve merge conflicts for 1.2.1] Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-embedded.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 8c15352ff9..05803d15e7 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r43"
+INC_PR = "r46"
QT_BASE_LIB ?= "libqt-embedded"