From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Mon, 2 Mar 2009 18:09:19 +0000 (+0100)
Subject: Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
X-Git-Tag: Release-2010-05/1~3911
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd53c790d6c3b19bff547755f804e5f2fccc56ed;p=openembedded.git

Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev

Conflicts:

	classes/qt4e.bbclass
	packages/bluez/bluez4_4.31.bb
	packages/mc/mc_4.6.2.bb
	packages/vte/vte.inc
	packages/vte/vte_0.16.13.bb
	packages/vte/vte_0.16.14.bb
---

dd53c790d6c3b19bff547755f804e5f2fccc56ed
diff --cc classes/qt4e.bbclass
index 3fac2bda9b,3f89fa9da3..8beef29df4
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@@ -2,8 -2,8 +2,7 @@@ DEPENDS_prepend = "${@["qt-embedded ", 
  inherit qmake2
  
  QT_DIR_NAME = "qtopia"
--#
- # override variables set by qmake-base to compile QtopiaCore apps
+ # override variables set by qmake-base to compile Qt/Embedded apps
  #
  export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
  export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
@@@ -11,3 -11,7 +10,6 @@@ export OE_QMAKE_LIBS_QT = "qt
  export OE_QMAKE_LIBS_X11 = ""
  export OE_QMAKE_EXTRA_MODULES = "network"
  EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
+ 
+ # Qt4 uses atomic instructions not supported in thumb mode
+ ARM_INSTRUCTION_SET = "arm"
 -
diff --cc packages/bluez/bluez4_4.31.bb
index da3f78bfeb,235fdd9f32..5063950c94
--- a/packages/bluez/bluez4_4.31.bb
+++ b/packages/bluez/bluez4_4.31.bb
@@@ -1,10 -1,10 +1,10 @@@
  DESCRIPTION = "Linux Bluetooth Stack Userland V4"
  SECTION = "libs"
  PRIORITY = "optional"
 -DEPENDS = "gst-plugins-base alsa-lib libusb-compat libusb1 dbus-glib"
 +DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib"
  HOMEPAGE = "http://www.bluez.org"
  LICENSE = "GPL"
- PR = "r1"
+ PR = "r3"
  
  SRC_URI = "\
    http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
diff --cc packages/vte/vte_0.16.14.bb
index 9453fee206,ecc3d8d846..4e88640b02
--- a/packages/vte/vte_0.16.14.bb
+++ b/packages/vte/vte_0.16.14.bb
@@@ -1,1 -1,3 +1,2 @@@
  require vte.inc
+ PR = "r1"
 -