diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 05:20:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-15 05:20:08 (GMT) |
| commit | 783d4911d61b986ca3c412662d1702dd18014be2 (patch) | |
| tree | 2f0cac21e6e2b398ddfabed6de2c94e92eb1f017 /examples/widgets/charactermap | |
| parent | 05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (diff) | |
| parent | b8ff1ae9d53d7cac64c90d3cf29a5f4ed7379330 (diff) | |
| download | Qt-783d4911d61b986ca3c412662d1702dd18014be2.zip Qt-783d4911d61b986ca3c412662d1702dd18014be2.tar.gz Qt-783d4911d61b986ca3c412662d1702dd18014be2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Compile with QT_NO_GESTURES.
Give file and line error information for errors in dummydata.
Restore any absolute geometry changed by AnchorChanges when returning
Export QDeclarativeScriptAction
Completing the interface for children/data/resources
Unit tests for Bauhaus enablers
This patch allows modifications on PropertyChanges on the fly
Diffstat (limited to 'examples/widgets/charactermap')
0 files changed, 0 insertions, 0 deletions