summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-198-6/+18
|\
| * Fix ListView sections with QList<QObject*>Martin Jones2010-07-192-1/+6
| * 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-198-22/+45
| |\
| * | PathView doc clarification.Martin Jones2010-07-192-1/+8
* | | 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-191-2/+2
|\ \ | |/
| * Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
* | 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
* | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-187-17/+17
|/ /
* | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-1798-552/+3755
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| | |\
| | | * 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
| | | |\ \ \
| | | | * | | Fixes the Oracle invalid date bug when date is greater or equal to 2800Charles Yin2010-07-161-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1712-4/+2542
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1612-4/+2542
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16214-6279/+11219
| | | |\ \ \ \
| | | | * | | | Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | * | | | Revert the change in applicationShouldTerminate().Fabien Freling2010-07-161-1/+0
| | | | * | | | Added LatinAmericaAndTheCaribbean country to the doc.Denis Dzyubenko2010-07-161-0/+1
| | | | * | | | Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1619-52/+169
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1422-392/+542
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-14435-11719/+11904
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-3021-63/+204
| | | | |\ \ \ \ \ \
| | | | * | | | | | | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| | | | * | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-2823-245/+227
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-27224-9384/+4526
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | fix actions regarding removal of connman. make tests pass on desktopLorn Potter2010-06-272-81/+91
| | | | * | | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-2167-389/+1377
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | fix ghost ap issue, and dont block on connectLorn Potter2010-06-212-82/+235
| | | | * | | | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-17283-4007/+4348
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | initial connman bearer backend.Lorn Potter2010-06-077-1/+2324
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-097-47/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
| * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-172-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-162-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |