Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Apr 2011 21:27:12 +0000 (07:27 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Apr 2011 21:27:12 +0000 (07:27 +1000)
commitcb188229132e36ef1fe1af4c8e2db0df6047be76
treeff42bedd48d786152967d4b92c3b19f48a07b4ba
parent98072ecf6a6dc07ac82038adf66048a1c17dbbb5
parentfa23cdf45a2416f0a4505f9f9bc63a83603dab74
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.