summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-171-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-1720-133/+135
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Doc: VisualDataModel.rootIndex is only affects hierarchical modelsGeir Vattekar2011-02-171-1/+2
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-1520-133/+135
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-0820-133/+135
| | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-07189-1512/+7276
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0499-530/+1946
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-264-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-173848-5044/+11248
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-057-31/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-209-178/+178
| | * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-253-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix QUnifiedTimer bugAlan Alpert2011-03-242-1/+8
| | | * | | | | | | | | | | | | | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
| | * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-251-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2011-03-241-1/+4
* | | | | | | | | | | | | | | | | | | | | Remove obsolete patch fileaavit2011-04-031-433/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Compilation fix for WinCEaavit2011-04-021-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'png151'aavit2011-04-01128-51389/+20279
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Avoid runtime warning about interlace handling from libpng 1.5aavit2011-03-251-0/+1
| * | | | | | | | | | | | | | | | | | | | Updating libpng: Patches to libpng for building it in Qtaavit2011-03-253-5/+190
| * | | | | | | | | | | | | | | | | | | | Updating libpng: Add libpng version 1.5.1aavit2011-03-2540-0/+54714
| * | | | | | | | | | | | | | | | | | | | Updating libpng: Remove version 1.4.0aavit2011-03-25124-86010/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-04-014-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Make sure we don't use subpixel positions in full hinting modeJiang Jiang2011-04-013-7/+4
| * | | | | | | | | | | | | | | | | | | | Fixed underline offset after raster coordinate system change.Samuel Rødal2011-04-011-1/+2
* | | | | | | | | | | | | | | | | | | | | Fix compilation of libtiff with zlib 1.2.5aavit2011-04-011-0/+2
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-04-014-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | QGLContext on EGL gets an additional QEglProperties static field applied to e...Michael Dominic K2011-04-013-1/+12
| * | | | | | | | | | | | | | | | | | | | Actually do use the properties parameter in ::createSurface for x11egl.Michael Dominic K2011-04-011-4/+7
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-04-0122-106/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer c...Arun Voleti2011-04-011-2/+3
| * | | | | | | | | | | | | | | | | | | | Check that pixmap is not null before accessing itPauli Nieminen2011-04-011-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fire-masterJørgen Lind2011-04-0111-57/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-2911-57/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Add a 'capabilities' flag to the marshaller and demarshallerThiago Macieira2011-03-297-34/+40
| | | * | | | | | | | | | | | | | | | | | | Add a set of connection capabilities to QDBusConnectionThiago Macieira2011-03-294-2/+31
| | | * | | | | | | | | | | | | | | | | | | Move the main D-Bus session and system connections to the main threadThiago Macieira2011-03-291-1/+11
| | | * | | | | | | | | | | | | | | | | | | Add a way to obtain the DBusConnection* pointer from a QDBusConnectionThiago Macieira2011-03-292-0/+17
| | | * | | | | | | | | | | | | | | | | | | Make the QIconvCodec on Unix not enforce the Latin1 codec.Thiago Macieira2011-03-291-20/+18
| * | | | | | | | | | | | | | | | | | | | | opengl2: Make maximum cached glyph size configurableSami Kyöstilä2011-03-311-1/+6
| * | | | | | | | | | | | | | | | | | | | | QWS: fix the software/hardware cursor switcherRitt Konstantin2011-03-312-5/+2
| * | | | | | | | | | | | | | | | | | | | | Fix horizontal centered text drawing without word wrapJiang Jiang2011-03-314-23/+30
| * | | | | | | | | | | | | | | | | | | | | Remove Font Smoothing hack for OS XJiang Jiang2011-03-311-8/+0
| * | | | | | | | | | | | | | | | | | | | | Revert "Fixed underline offset after raster coordinate system change."Samuel Rødal2011-03-301-2/+1
| * | | | | | | | | | | | | | | | | | | | | Fix the painting for widgets painting directly on screen.Fabien Freling2011-03-301-7/+4
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'zlib125'aavit2011-04-0172-9263/+7486
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Upgrading zlib: Patches to build internal zlib in Qtaavit2011-03-242-1/+14
| * | | | | | | | | | | | | | | | | | | | | Upgrading zlib: Add zlib version 1.2.5aavit2011-03-2444-0/+18973
| * | | | | | | | | | | | | | | | | | | | | Upgrading zlib: Remove zlib version 1.2.3aavit2011-03-2459-20763/+0
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |