diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:31 +0000 |
commit | 670706d1d3e3b16636818584fec0441f70b793d9 (patch) | |
tree | c732b65f9e5049fb5694cdbe648f08f262f5e911 /meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | |
parent | 99a6e1a3a453c17575439723599da6bef62175bb (diff) | |
download | poky-670706d1d3e3b16636818584fec0441f70b793d9.tar.gz |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-tools-nativesdk.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
30 | 30 | ||
31 | # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" | 31 | # FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" |
32 | EXTRA_OECONF = "-prefix ${prefix} \ | 32 | EXTRA_OECONF = "-prefix ${prefix} \ |
33 | -qt-libjpeg -qt-gif -system-zlib \ | 33 | -qt-libjpeg -system-zlib \ |
34 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ | 34 | -no-libjpeg -no-libpng -no-libmng -no-libtiff \ |
35 | -no-accessibility \ | 35 | -no-accessibility \ |
36 | -no-cups \ | 36 | -no-cups \ |