Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 11:55:04 +0000 (21:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 11:55:04 +0000 (21:55 +1000)
commitc1031d334f6ecac42a3cb57ea326a1a8cfa7fa1e
treec0d4bdabd614719c4125b501b1b8c6e094ba5938
parentfe0a4972b89d082b6f5557653a916b827dd6f865
parent0377b7f96de5b12ab38e0ebd3068c6d17347f39d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove warning from QColor::setNamedColor().