summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-23 18:31:45 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-23 18:31:45 (GMT)
commit80a8a3b878eff6f29b68fb4ff4dd9a7b4e00237e (patch)
tree592f3a99b94e00b370159e714d7efe6dccfe120a /lib
parentd405aa6510514ce02b312994db55c305bde60285 (diff)
parent0cf3bf6469fbac3fe70cbd3f3d9d513848684425 (diff)
downloadQt-80a8a3b878eff6f29b68fb4ff4dd9a7b4e00237e.zip
Qt-80a8a3b878eff6f29b68fb4ff4dd9a7b4e00237e.tar.gz
Qt-80a8a3b878eff6f29b68fb4ff4dd9a7b4e00237e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed touch event delivery in QGraphicsView. let WebKit inject itself into the qt configuration add indirect input/output specification capability to QMAKE_SUBSTITUTES Add test that exercises lupdate warnings for QtScript Make qsTrId() / QT_TRID_NOOP() accessible from QtScript Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP() Add support for comments and meta-data in the lupdate QtScript frontend Streamline lupdate's QtScript frontend's error messaging Doc: linking up orphant files Doc: Updating menu links
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions