summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-2313-105/+209
|\
| * Reset GL glyph cache when texture limit is reachedEskil Abrahamsen Blomfeldt2011-03-236-2/+45
| * unlockFace was put in the wrong place in previous patchJiang Jiang2011-03-221-2/+2
| * Implement subpixel positioning with FreeTypeJiang Jiang2011-03-228-105/+166
* | Avoid repeatedly trying to load unloadable plugins, causing slownessaavit2011-03-231-2/+7
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-213-2/+19
|\
| * Optimized glyph uploads in GL texture cache.Samuel Rødal2011-03-213-2/+19
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-2153-915/+2565
|\ \
| * \ Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-21440-4580/+19637
| |\ \ | |/ / |/| |
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-196-26/+234
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-186-26/+234
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-173-5/+76
| | |\ \ \
| | | * | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | * | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | * | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-173-21/+158
| | |\ \ \ \
| | | * | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-172-0/+100
| | | * | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-172-21/+58
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-182-4/+5
|\ \ \ \ \ \ \
| * | | | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
* | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-03-18197-1566/+9267
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes detected by the static-checkJørgen Lind2011-03-174-4/+86
| * | | | | | | | Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-17101-113/+441
| * | | | | | | | Mac: add autorelease pools to create_sysMorten Sorvig2011-03-171-0/+4
| * | | | | | | | Don't skip remaining events on unhandled events in xcb backend.Samuel Rødal2011-03-171-2/+6
| * | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-17730-6261/+24045
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| * | | | | | | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-162-5/+16
| * | | | | | | | | Lighthouse: Add pkg-config check for opengl es2Jørgen Lind2011-03-161-1/+10
| * | | | | | | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-168-9/+14
| * | | | | | | | | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-162-2/+2
| * | | | | | | | | Add QT_NO_FILESYSTEMITERATOR.Morten Johan Sørvig2011-03-165-0/+30
| * | | | | | | | | Add QT_NO_DYNAMIC_LIBRARY.Morten Johan Sørvig2011-03-161-7/+11
| * | | | | | | | | Compile.Morten Johan Sørvig2011-03-161-1/+5
| * | | | | | | | | NaCl: Dont force release builds.Morten Johan Sørvig2011-03-161-2/+0
| * | | | | | | | | NaCl: disable libtiff. Morten Johan Sørvig2011-03-161-0/+1
| * | | | | | | | | posix platformdefs: Add QT_NO_SOCKET_H.Morten Johan Sørvig2011-03-161-1/+3
| * | | | | | | | | qpnghandler: Compile with QT_NO_IMAGE_TEXT.Morten Johan Sørvig2011-03-161-0/+2
| * | | | | | | | | Lighthouse: Support Q_NO_CLIPBOARD.Morten Johan Sørvig2011-03-164-0/+14
| * | | | | | | | | Compile.Morten Johan Sørvig2011-03-161-0/+2
| * | | | | | | | | Fix CoreServices framework addition for qpa.Morten Johan Sørvig2011-03-161-7/+6
| * | | | | | | | | Update NaCl mkspecs.Morten Johan Sørvig2011-03-164-407/+79
| * | | | | | | | | Properly set the window event masks etc for screens and GL windows too.Samuel Rødal2011-03-152-3/+5
| * | | | | | | | | Fix race condition in the non-GL casePaul Olav Tvete2011-03-143-5/+12
| * | | | | | | | | Do release build for devices and remove some warnings.con2011-03-116-33/+46
| * | | | | | | | | XmlPatterns actually compiles and runs.con2011-03-101-2/+2
| * | | | | | | | | Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-103-3/+8