summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | | | | | | Fix typo in QFontDialog docsJiang Jiang2011-07-251-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Reset previousGlyph once we reached a new text itemJiang Jiang2011-07-251-0/+1
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-272-9/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Symbian^3 workaround: Avoid usage of linked fonts.Alessandro Portale2011-07-272-9/+62
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-262-2/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Make it possible to update a related table after an external updateAndy Shaw2011-07-262-2/+57
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-07-2622-9/+366
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Add test case name and drop parentheses for -datatags option.Jo Asplin2011-07-265-44/+49
| * | | | | | | | | | | | | | | | | | | | | | Adding QTDIR validation in tst_symbols autotestSergio Ahumada2011-07-261-0/+8
| * | | | | | | | | | | | | | | | | | | | | | Disabled benchmarks referring to private headers.Jo Asplin2011-07-263-6/+3
| * | | | | | | | | | | | | | | | | | | | | | Add license header to printdatatags autotestsSergio Ahumada2011-07-262-0/+84
| * | | | | | | | | | | | | | | | | | | | | | Compile on symbian^3Jo Asplin2011-07-264-1/+19
| * | | | | | | | | | | | | | | | | | | | | | Compile on Symbian^3.Jo Asplin2011-07-261-0/+5
| * | | | | | | | | | | | | | | | | | | | | | Added -datatags option to QTestLibjasplin2011-07-2612-1/+241
| * | | | | | | | | | | | | | | | | | | | | | Fixed failure of tst_qxmlquery::evaluateToReceiverRohan McGovern2011-07-261-1/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-252-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2525-80/+2145
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-232-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Build Qt for Symbian on Mac/gcce againLiang Qi2011-07-222-2/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-2223-77/+2142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | / / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-2050-3762/+2342
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |