summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* moc: Slot with complex template default value does not compileOlivier Goffart2010-07-192-1/+36
* 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
|\
| * 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
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Fix SamegameAlan Alpert2010-07-191-2/+2
| | * | | PathView doc clarification.Martin Jones2010-07-195-12/+27
* | | | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1913-2/+137
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ | | |/ /
| * | | Always place PathView delegates centered on the pathMartin Jones2010-07-192-0/+10
| * | | Add a PathView example.Martin Jones2010-07-1910-0/+125
* | | | 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
|/ / /
* | | 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
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+1
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-161-1/+1
| | |\ \
| | | * | Fixed some network tests never being run.Rohan McGovern2010-07-161-1/+1
| | |/ /
| * | | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-17323-3084/+10957
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-172-0/+12
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-172-0/+12
| |\ \ \ \
| | * | | | Rebuild configure.exe.Jason McDonald2010-07-171-0/+0
| | * | | | QDeclarativeDebugTrace: Do not send message if the client did not enabled Can...Olivier Goffart2010-07-161-0/+12
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-175-11/+23
|\ \ \ \ \ \
| * | | | | | Revert "Used aligned load and store when possible for the blending of ARGB32"Jason McDonald2010-07-171-29/+5
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-176-16/+52
| |\ \ \ \ \ \
| | * | | | | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-161-5/+29
| | * | | | | | Windows mobile: hide [X] button in task bar on unmaximizeJoerg Bornemann2010-07-163-0/+19
| | * | | | | | Windows mobile: the [X] button in the taskbar minimizes the widgetJoerg Bornemann2010-07-161-1/+1
| | * | | | | | Windows mobile: show the [X] button in the taskbar when maximizingJoerg Bornemann2010-07-161-0/+2
| | * | | | | | unused struct DIBINFO removed from qguifunctions_wince.cppJoerg Bornemann2010-07-161-9/+0
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-161-1/+1
| | |\ \ \ \ \ \