summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-227-13/+99
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-21198-9966/+275
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Don't include qdbusvirtualobject header twice.Frederik Gladhorn2011-07-211-2/+1
| | | * | | | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2063-20313/+42103
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-0152-269/+2148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-291-13/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Make macdeployqt more robust against usage of symbolic links.Eike Ziller2011-07-291-13/+32
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-272-0/+118
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Document support for Linguist on Mac.Eike Ziller2011-07-272-0/+118
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-262-26/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.Eike Ziller2011-07-262-18/+54
| | | * | | | | | | | | | | | | | | | | | Guard macdeployqt against @rpath and @loader_path too.Eike Ziller2011-07-261-2/+2
| | | * | | | | | | | | | | | | | | | | | Fix typo.Eike Ziller2011-07-261-6/+6
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-263-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | OpenVG cleanup.Nikolaos Korkakakis2011-07-262-0/+13
| | | * | | | | | | | | | | | | | | | | | Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-26392-33783/+45944
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Fix the compilation error when QT_NO_PLUGIN_CHECK was set.Nikolaos Korkakakis2011-07-261-1/+6
| | | * | | | | | | | | | | | | | | | | | Fixed holes in border image drawing by introducing new API.Samuel Rødal2011-07-2610-148/+294
| | | * | | | | | | | | | | | | | | | | | Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.Samuel Rødal2011-07-263-13/+28
| | | * | | | | | | | | | | | | | | | | | Revert "fix QFileInfo::isSymLink() for NTFS mount points"Jiang Jiang2011-07-261-1/+2
| | | * | | | | | | | | | | | | | | | | | Remove debug output.Eike Ziller2011-07-261-1/+0
| | | * | | | | | | | | | | | | | | | | | Add some sound support to the uikit platform.Eike Ziller2011-07-2510-29/+827
| | | * | | | | | | | | | | | | | | | | | Add flickrdemo uikit example project.Eike Ziller2011-07-255-0/+638
| | | * | | | | | | | | | | | | | | | | | Fix uikit simulator build.Eike Ziller2011-07-251-2/+2
| | | * | | | | | | | | | | | | | | | | | Get subpixel antialiasing again w/combo of raster and affine transformEskil Abrahamsen Blomfeldt2011-07-251-9/+3
| | | * | | | | | | | | | | | | | | | | | Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-225-9/+79
| | | * | | | | | | | | | | | | | | | | | optimize QRawFont::supportsCharacter()Ritt Konstantin2011-07-222-4/+15
| | | * | | | | | | | | | | | | | | | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-22360-33660/+44144
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-219-13/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-217-13/+13
| | | * | | | | | | | | | | | | | | | | | | Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-212-0/+12
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-296-31/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-021-21/+2
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | / / / / / / | | | | | | | | | | | | | | | |/ / / / / /
| | | | | | | | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | * | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
| | | | | | | | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-08-020-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-1212-71/+144
| | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0812-166/+294
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-069-17/+49
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0693-1707/+2377
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-2896-353/+1983
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-296-31/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | _ / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-271-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Remove a duplicate include lineLiang Qi2011-07-271-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-273-9/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15
| | | * | | | | | | | | | | | | | | | | | | | | | | | Fix compilation under OSX 10.7 or using llvm-gcc.Mike McQuaid2011-07-261-4/+4