summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Olivier Goffart2009-04-155-13/+25
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Display QAction keyboard shortcuts in action editor correctly.Friedemann Kleint2009-04-155-13/+25
| | | | | | | | Use PropertySheetKeySequenceValue instead of plain strings.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJarek Kobus2009-04-021-0/+11
|\ \
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-0/+11
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| | * Add missing copyright headers and the "we mean it" section.Thiago Macieira2009-03-311-0/+11
| | | | | | | | | | | | | | | | | | These were reported by mkdist Reviewed-by: TrustMe
* | | Implement the filter for resource browserJarek Kobus2009-04-022-26/+164
|/ / | | | | | | | | Task: 249659 Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-0/+1
|\ \ | |/
| * Fix backslashes in string propeerty in property browserJarek Kobus2009-03-301-0/+1
| | | | | | | | | | | | | | Inside DesignerEditorFactory::createTextEditor() we first do setText() and afterwards we do setTextPropertyValidationMode(). setTextPropertyValidationMode() didn't update the cached text. Below patch fixes it. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: 245503
| * Long live Qt 4.5!Lars Knoll2009-03-23794-0/+154425
|
* Long live Qt!Lars Knoll2009-03-23794-0/+154840