summaryrefslogtreecommitdiffstats
path: root/src/plugins/codecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-1321-29/+29
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-122-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-126-6/+6
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-1221-21/+21
| | | | | | | | Reviewed-by: Trust Me
* | Removed unused static data from Qt.axis2009-07-061-1/+0
| | | | | | | | This saves memory and prevents warnings from RVCT.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2921-42/+42
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1621-42/+42
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-2326-0/+39572
|
* Long live Qt for S60!axis2009-04-2426-0/+39580