From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Thu, 12 May 2011 23:05:00 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4307
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdd524ea979342aa7a8d2a4469ce53b2a859d308;p=profile%2Fivi%2Fqtbase.git

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
---

cdd524ea979342aa7a8d2a4469ce53b2a859d308