summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-153-6/+41
|\
| * Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"Shane Kearns2011-06-142-10/+4
| * QFileInfoGatherer: call QFileSystemWatcher addPaths from proper threadShane Kearns2011-06-132-4/+10
| * Also test http proxy in the QTcpServer benchmarkShane Kearns2011-06-131-0/+6
| * Symbian QFileSystemWatcher: fix potential crashShane Kearns2011-06-131-2/+2
| * Enable QTcpServer benchmark on symbianShane Kearns2011-06-132-4/+33
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-06-144-32/+31
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-278576-152706/+160289
| |\ \
| | * \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-268451-142013/+141889
| | |\ \
| | * | | When asking for relations, don't crash on children that don't return an inter...Frederik Gladhorn2011-05-191-4/+7
| | * | | Merge branch '4.8-upstream'Thierry Bastian2011-05-19665-11977/+19685
| | |\ \ \
| | * | | | Remove more inconsistencies with invisible.Frederik Gladhorn2011-05-191-18/+0
| | * | | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
| | * | | | QAccessibleToolButton::text should return accessibleName if set.Frederik Gladhorn2011-05-051-1/+1
| | * | | | Remove stray semicolon.Frederik Gladhorn2011-05-051-1/+1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-1415-98/+259
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-1481-431/+487
| |\ \ \ \ \ \
| | * | | | | | Revert "Fix compilation of lrelease on Windows"aavit2011-06-141-2/+0
| | * | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-1481-429/+487
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-10262-5971/+15390
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix compilation of lrelease on Windowsaavit2011-06-101-0/+2
| | * | | | | | | Allow selecting fonts with irregular style namesJiang Jiang2011-06-1012-96/+217
| | * | | | | | | Fix missing empty lines in Qt HTML when displayed in compliant browsersEskil Abrahamsen Blomfeldt2011-06-102-2/+26
| | * | | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-09249-5874/+15146
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-081-0/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Protect against deleted windowsLars Knoll2011-06-081-0/+16
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-145-29/+58
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix alignment value not handled in ODFThiago Macieira2011-06-141-0/+1
| * | | | | | | | | Silence a compiler warning about unhandled enum in switchThiago Macieira2011-06-141-0/+4
| * | | | | | | | | Silence the "array out of bounds" warning in GCC 4.6.Thiago Macieira2011-06-141-0/+7
| * | | | | | | | | Silence the callgrind warnings in our source code when using gcc 4.6Thiago Macieira2011-06-141-0/+11
| * | | | | | | | | Create a function that merges the SSE common codeThiago Macieira2011-06-141-38/+35
| * | | | | | | | | Improve toLatin1 x86 SIMD by using a new SSE4.1 instructionThiago Macieira2011-06-141-0/+9
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-101-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Disabling DEF files to get around building problems.Sami Lempinen2011-06-101-1/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix building the OpenVG graphicssystem on Linux with static libsBernhard Rosenkraenzer2011-06-101-0/+1
| * | | | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-10364-4949/+13521
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix build on windows 7Oswald Buddenhagen2011-06-101-1/+0
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-0978-427/+485
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-06-0979-427/+486
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-094-1/+25
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-091-0/+1
| | | * | | | | | | | | | | QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-083-1/+24
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-0276-424/+459
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Fix docs on caching for images loaded by image providersBea Lam2011-06-023-4/+39
| | | * | | | | | | | | | | Fixed compile of tst_qscriptextensionplugin on some Windows configurationsRohan McGovern2011-06-011-0/+1
| | | * | | | | | | | | | | QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-313-7/+39