[oe-commits] Paul Eggleton : qt4: add version 4.8.0
git at git.openembedded.org
git at git.openembedded.org
Wed Jan 4 12:16:15 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6b2a5d15ad20573502142b635e6cab9bcfb3b40a
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Tue Jan 3 13:41:33 2012 +0000
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.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-qt/qt4/qt-4.8.0.inc | 61 ++++++++++++++++++
.../0001-Added-Openembedded-crossarch-option.patch | 47 ++++++++++++++
.../recipes-qt/qt4/qt-4.8.0/fix-translations.patch | 32 ++++++++++
meta/recipes-qt/qt4/qt-4.8.0/g++.conf | 56 +++++++++++++++++
.../qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch | 31 +++++++++
meta/recipes-qt/qt4/qt-4.8.0/linux.conf | 66 ++++++++++++++++++++
meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch | 20 ++++++
meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb | 13 ++++
meta/recipes-qt/qt4/qt4-native.inc | 13 +++-
meta/recipes-qt/qt4/qt4-native_4.8.0.bb | 14 ++++
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb | 8 +++
meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb | 13 ++++
meta/recipes-qt/qt4/qt4.inc | 12 +++-
14 files changed, 382 insertions(+), 6 deletions(-)
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=6b2a5d15ad20573502142b635e6cab9bcfb3b40a
More information about the Openembedded-commits
mailing list