Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:13:17 +0000 (23:13 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:13:17 +0000 (23:13 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
  Designer: Add functionality for IDE integration.
  Compile fix (Windows).
  Add QT_xxx_VERSION macros for each library in qttools
  Designer: Move PropertySheet::isEnabled to base class.


Trivial merge