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)
commit46410a7f66cda763ade478ec37f9da4b38a3c6b7
treea42f7343ae053f99fefa1e574429339c911f139e
parent363d254bd46c0c15a34c4ff533dad7f606425537
parent9c097405da370fca3fabfb5828bb8e623806539c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging

* '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.