diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 01:47:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 01:47:12 (GMT) |
| commit | 19f55bfa5bf15b5593f3021071374dbe2f71f8c8 (patch) | |
| tree | 55966841b5802fafaf793d7a9c75adf88fc08a3e /src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp | |
| parent | 9aef5ac9fd2452657ca018325db54e374bdeb164 (diff) | |
| parent | 1d222c8b93fd37921fdcf2baa69c5dc110fdc31f (diff) | |
| download | Qt-19f55bfa5bf15b5593f3021071374dbe2f71f8c8.zip Qt-19f55bfa5bf15b5593f3021071374dbe2f71f8c8.tar.gz Qt-19f55bfa5bf15b5593f3021071374dbe2f71f8c8.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:
fix autotest
Adapt the TapAndHold recognizer to non-touch too
add setNativeArguments() and nativeArguments()
fix bogus return value from qprocess::execute()
qdoc: Simplified code to enable fixing of QTBUG-6340.
Doc: fixing img style
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp')
0 files changed, 0 insertions, 0 deletions