Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/4.5' | Olivier Goffart | 2009-04-15 | 5 | -13/+25 |
|\ | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | Display QAction keyboard shortcuts in action editor correctly. | Friedemann Kleint | 2009-04-15 | 5 | -13/+25 |
| | | | | | | | | Use PropertySheetKeySequenceValue instead of plain strings. | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Jarek Kobus | 2009-04-02 | 1 | -0/+11 |
|\ \ | |||||
| * \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-01 | 1 | -0/+11 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp | ||||
| | * | Add missing copyright headers and the "we mean it" section. | Thiago Macieira | 2009-03-31 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | These were reported by mkdist Reviewed-by: TrustMe | ||||
* | | | Implement the filter for resource browser | Jarek Kobus | 2009-04-02 | 2 | -26/+164 |
|/ / | | | | | | | | | Task: 249659 Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com> | ||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-03-30 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Fix backslashes in string propeerty in property browser | Jarek Kobus | 2009-03-30 | 1 | -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 Knoll | 2009-03-23 | 794 | -0/+154425 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 794 | -0/+154840 |