diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 05:17:40 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 05:17:40 (GMT) |
| commit | 57945bb918ae698a67bcf74095247c0a8f82c163 (patch) | |
| tree | df6374fc9e95df833a078f55110de4ed90335013 /doc/src/snippets/mainwindowsnippet.cpp | |
| parent | 73707576e8c257a428f4456813feb34da6895565 (diff) | |
| parent | 3c85728f2cb69817d4b72d3aab16b7a7fe6bdbf0 (diff) | |
| download | Qt-57945bb918ae698a67bcf74095247c0a8f82c163.zip Qt-57945bb918ae698a67bcf74095247c0a8f82c163.tar.gz Qt-57945bb918ae698a67bcf74095247c0a8f82c163.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tests/auto/declarative/qmlbindengine/bindingLoop.txt
tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt
tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt
tests/auto/declarative/qmlbindengine/deferredProperties.txt
tests/auto/declarative/qmlbindengine/extensionObjects.txt
tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt
tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt
tests/auto/declarative/qmlbindengine/methods.1.txt
tests/auto/declarative/qmlbindengine/methods.2.txt
tests/auto/declarative/qmlbindengine/signalAssignment.1.txt
tests/auto/declarative/qmlbindengine/signalAssignment.2.txt
tests/auto/declarative/qmlbindengine/testtypes.cpp
Diffstat (limited to 'doc/src/snippets/mainwindowsnippet.cpp')
0 files changed, 0 insertions, 0 deletions