Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 14:16:06 +0000 (00:16 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 14:16:06 +0000 (00:16 +1000)
commitf5ec7f0f6bbedc537b1ad71bab7a806a6e0d85c3
treeb429f1931a097a534b0a5291a9ccc2cbd2ccf8b8
parent66f264f1153436cc0ace72e7ba16e077a284311c
parentb57a7e6994abdab2b7ff7c7fc19549d66dbf598f
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  QT_USE_QSTRINGBUILDER to fix source compatibility