Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 23:05:00 +0000 (09:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 23:05:00 +0000 (09:05 +1000)
commitcdd524ea979342aa7a8d2a4469ce53b2a859d308
tree47a2dab9cba0f414bdf2a84613bf1c21ac5e2acd
parent664517abdefcdce692a4078770fbd96068fec1f4
parent152a10012ce3582ee64d38eca991aae975cffd24
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