Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 09:19:12 +0000 (19:19 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 09:19:12 +0000 (19:19 +1000)
commite14d3aa5c46f4c3ccbbe3af97b365440aa5afbe8
treec7335ea4fd2a4121f5aaea08700794b74e0117d3
parentd0343621a3301cb7a738bba84854d512737d1cfd
parentba3436cda15fc342325699b182a120ba90a93283
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fixed detection of QtBase directory.