Merge remote-tracking branch 'oe-lite/master' into qtmerge
authorMorten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk>
Wed, 8 Feb 2012 08:33:53 +0000 (09:33 +0100)
committerMorten Thunberg Svendsen <morten.thunbergsvendsen@prevas.dk>
Wed, 8 Feb 2012 08:33:53 +0000 (09:33 +0100)
commitc962fdc5eb0d697889f0a16c51dc82e7b87e565f
tree03f67f431ce2ccde05edd629c87f51b5f2787e0b
parent3634e33b8e849c956e100ca57401d5a099510bc5
parentd4fb2ea9d12c4f0ea484b3a7aea196bc070fa60a
Merge remote-tracking branch 'oe-lite/master' into qtmerge

Conflicts:
classes/qmake_base.oeclass
classes/qt4e.oeclass
recipes/qt4/qt-4.7.4.inc
recipes/qt4/qt4-embedded_4.7.4.oe
recipes/qt4/qt4-tools_4.7.4.oe
recipes/qt4/qt4.inc
recipes/qt4/qt-4.7.4.inc
recipes/qt4/qt4-embedded_4.7.4.oe
recipes/qt4/qt4-tools_4.7.4.oe
recipes/qt4/qt4.inc