Patchwork [2/3] qt4.inc: give the right name to variable qmake will use

login
register
mail settings
Submitter Eric BENARD
Date May 12, 2011, 9:31 p.m.
Message ID <1305235863-16025-3-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/3907/
State Accepted
Headers show

Comments

Eric BENARD - May 12, 2011, 9:31 p.m.
this should prevent to have to manually copy binaries for the build
system built by qt4-native to the source tree when cross compiling qt.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes/qt4/qt4.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Otavio Salvador - May 12, 2011, 9:43 p.m.
On Thu, May 12, 2011 at 18:31, Eric Bénard <eric@eukrea.com> wrote:
> this should prevent to have to manually copy binaries for the build
> system built by qt4-native to the source tree when cross compiling qt.

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Patch

diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 52fa146..dc27fe2 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -17,8 +17,9 @@  EXTRA_OEMAKE = "-e"
 EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-             AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+             AR="${TARGET_PREFIX}ar cqs" QMAKE_LRELEASE="${STAGING_BINDIR_NATIVE}/lrelease4" \
+             QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" \
+             QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
 
 export QT_CONF_PATH="${WORKDIR}/qt.conf"