summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Workaround gcc bug, disable test with old version of gccOlivier Goffart2010-07-201-0/+4
* Merge branch 'QTBUG-6843' into 4.7Jan-Arve Sæther2010-07-201-2/+2
|\
| * Do not crash due to a infinite recursion when using voiceover on MacOSJan-Arve Sæther2010-07-201-2/+2
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-07-202-1/+79
|\ \
| * | QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-202-1/+79
* | | doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-202-4/+2
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-202-1/+36
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-202-1/+36
| |\ \
| | * | moc: Slot with complex template default value does not compileOlivier Goffart2010-07-192-1/+36
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-207-96/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove some files as instructed by Legal department.Jason McDonald2010-07-207-96/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \ |/ / / /
| * | | Check in the correct configure.exeDaniel Molkentin2010-07-191-0/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ \
| | * | | Examples: Fix compilation with namespace.ck2010-07-198-8/+10
| | * | | Rebuilt configure.exeDaniel Molkentin2010-07-191-0/+0
| | * | | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-192-2/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-194-776/+17
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-1952-793/+490
| |\ \ \
| * | | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-191-1/+18
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Do image comparison with fuzzHarald Fernengel2010-07-191-1/+18
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
| |\ \ \ | | |/ / | |/| |
| | * | Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1924-711/+388
| | * | Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | * | Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1919-78/+77
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-195-59/+32
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-195-12/+27
| | |\ \ \
| | * | | | Remove the -use-blur option from qtdemoAlan Alpert2010-07-195-56/+1
| | * | | | Add label to explain how to exit QML demosAlan Alpert2010-07-191-5/+33
| * | | | | Fix ListView sections with QList<QObject*>Martin Jones2010-07-194-1/+12
| * | | | | Doc error fixes.Martin Jones2010-07-194-4/+4
| | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1912-27/+50
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-1924-27/+185
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1913-2/+137
|\ \ \ \ \
* \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-181-5/+28
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2Andreas Kling2010-07-181-4/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-181-5/+28
| |\ \ \ \ \
| | * | | | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-171-5/+28
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1810-20/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-1810-20/+20
|/ / / / / /
| | | | * | Fix SamegameAlan Alpert2010-07-191-2/+2
| |_|_|/ / |/| | | |
| | | * | PathView doc clarification.Martin Jones2010-07-195-12/+27
| | |/ /
| | * | Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-19298-2749/+10220
| | |\ \ | |_|/ / |/| | |
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-1731-145/+423
|\ \ \ \ | |/ / / |/| | |