diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 16:22:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 16:22:51 (GMT) |
| commit | c612fda5ae8fc0ebfb3ae455170882014c5951e1 (patch) | |
| tree | 2bd899b6b94368220aaac577ff1df380ab36224c /src/gui/image/qpixmapcache.cpp | |
| parent | 42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff) | |
| parent | 684e86adea5e89d6220560e82f1823f99920bb40 (diff) | |
| download | Qt-c612fda5ae8fc0ebfb3ae455170882014c5951e1.zip Qt-c612fda5ae8fc0ebfb3ae455170882014c5951e1.tar.gz Qt-c612fda5ae8fc0ebfb3ae455170882014c5951e1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compile for namespaced qt.
Designer: Implement isDirty()-handling using a QUndoStack.
doc: A QPlainTextEdit is never a QTextBrowser
fix line endings
Designer:Fix undo crash caused by special handling of key move.
Fix qml test breakage of 12180c397a2007970978033928b4b5b12efad7c6
Assistant: Rebuild search index at most once at start-up.
Prepare translations of the declarative module.
Diffstat (limited to 'src/gui/image/qpixmapcache.cpp')
0 files changed, 0 insertions, 0 deletions