From 670706d1d3e3b16636818584fec0441f70b793d9 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 3 Jan 2012 13:41:33 +0000 Subject: qt4: add version 4.8.0 Version 4.8.0 makes a few minor changes in the internal build system - the following issues had to be worked around: * The -qt-gif configure option has been removed. This is actually the default and has been for some time, so remove it from qt4.inc. * The mkspecs have been refactored requiring us to copy our g++.conf file over the top of g++-unix.conf instead. Some modifications to this file were also necessary to remove some settings that are now in other conf files (and we don't modify those values in any case). * The LD environment variable needs to be unset during configure, or else the configure script overrides our value of QMAKE_LINK which selects ${CXX} as our linker. * QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure script does not expect and cannot expand and this results in webkit being disabled, so add a workaround for this. (From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc') diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index a71c3ae7b0..275fdcc68c 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc @@ -30,7 +30,7 @@ require qt4_arch.inc # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" EXTRA_OECONF = "-prefix ${prefix} \ - -qt-libjpeg -qt-gif -system-zlib \ + -qt-libjpeg -system-zlib \ -no-libjpeg -no-libpng -no-libmng -no-libtiff \ -no-accessibility \ -no-cups \ -- cgit v1.2.3-54-g00ecf