[OE-core] [PATCH] qt4: update to latest version 4.7.4

[Eric Bénard]

Hi Koen,

Le 21/09/2011 12:44, Koen Kooi a écrit :
> Op 20 sep. 2011, om 23:18 heeft Eric Bénard het volgende geschreven:
>> ok 2 branches are available here : git://github.com/eukrea/oe-core.git
>> - qt4_improve for improvement to existing qt 4.7.3,
>> - qt4_upgrade for adding qt 4.7.4 (with DEFAULT_PREFERENCE=-1 as suggested by Koen.
>>
>> Please test them so that we can fix potential failures and send the pull request (I have compile test actually running with the latest changes in qt4_upgrade branch so this one is not yet fully tested).
>
> I'm building the qt4_upgrade branch + http://patches.openembedded.org/patch/11289/ + PREFERRED_VERSION change in angstrom. If you don't hear anything the test went OK :)

in angstrom you also need to add :
+PREFERRED_VERSION_qt4-native = "${ANGSTROM_QT_VERSION}"
else qt4-native 4.7.3 will be used.

Eric

diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/dis
index 2fee7f1..8bbdb4d 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -1,5 +1,5 @@
  ANGSTROM_MESA_VERSION = "7.10.2"
-ANGSTROM_QT_VERSION ?= "4.7.3"
+ANGSTROM_QT_VERSION ?= "4.7.4"
  ANGSTROM_LIBTOOL_VERSION = "2.4"
  # Use new sysroot feature
  LIBTOOL_HAS_SYSROOT = "yes"
@@ -49,6 +49,7 @@ PREFERRED_VERSION_pkgconfig   = "0.25"
  PREFERRED_VERSION_pkgconfig-native = "0.25"
  PREFERRED_VERSION_pulseaudio   = "0.9.23"
  PREFERRED_VERSION_python-pycairo = "1.8.0"
+PREFERRED_VERSION_qt4-native = "${ANGSTROM_QT_VERSION}"
  PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
  PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
  PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"