Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-14 | 6 | -6/+6 |
|\ | |||||
| * | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 6 | -6/+6 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-03 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Merge branch '4.5' | Thiago Macieira | 2009-08-03 | 1 | -1/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp | ||||
| | * | Musicplayer example crashes when trying to open unvalid file | Richard Moe Gustavsen | 2009-07-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | Reason: Example tries to get media from QList with an index out of bounds. Nothing to do with Phonon. Task-number: 253307 | ||||
* | | | unwarn | Warwick Allison | 2009-07-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 6 | -12/+12 |
|\ \ | |/ | |||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 6 | -12/+12 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 1 | -1/+1 |
|/ | | | | We introduce this new enum, we should be using it. | ||||
* | Fixed typo in README file | Nils Christian Roscher-Nielsen | 2009-05-06 | 1 | -1/+1 |
| | | | | Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
* | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 10 | -0/+923 |