diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-12 00:37:52 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-12 00:37:52 (GMT) |
commit | 3906239fca832896ebdd85d4fc80e083b0c2b5ce (patch) | |
tree | 569a2534a4d8ae589e6cef87c7ea6a5ef1dd47a0 /src/gui/kernel/qsoftkeymanager.cpp | |
parent | d014d3ab9a333cc9a9b2b60acc178019bd5c29ac (diff) | |
parent | 72c58996a5fc7c7a1a82fefa5a0034f57383e788 (diff) | |
download | Qt-3906239fca832896ebdd85d4fc80e083b0c2b5ce.zip Qt-3906239fca832896ebdd85d4fc80e083b0c2b5ce.tar.gz Qt-3906239fca832896ebdd85d4fc80e083b0c2b5ce.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlInspector: Fix moc error
QmlInspector: Fix compile for QT_NO_CURSOR
QmlInspector: Remove unused toolbar
JSDebugger: Only hit breakpoints in user code
Prevent Binding from crashing when its target object is deleted.
Cleanup QMLViewer properly when exiting via File->Quit.
Fix crash when assigning a list property to transitions.
Qml Debugging: only read properties that can be displayed in the debugger
qmldump: Fix creation of objects from QDeclarativeTypes.
Document state fast-forwarding.
qmlplugindump: Update qmltypes file format documentation.
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
0 files changed, 0 insertions, 0 deletions