summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \
| | | * | | | | 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-1790-97/+5938
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove license headers from .pro files in new modelview examples.Jason McDonald2010-07-177-280/+0
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1690-97/+6218
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Doc: Added license documentation for 3rd party code and data.David Boddie2010-07-162-16/+267
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16467-8867/+19403
| | |\ \ \ \ \ \
| | | * | | | | | Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | * | | | | | Link to the unsinstalled libraries first.Petri Latvala2010-07-161-1/+1
| | | * | | | | | 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-16101-855/+1920
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1453-464/+1179
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-14801-16821/+22705
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-30111-325/+653
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-2841-268/+461
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-271791-47018/+36491
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | 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-21123-548/+2342
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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-17626-7031/+13947
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | initial connman bearer backend.Lorn Potter2010-06-077-1/+2324
| | * | | | | | | | | | | | | | Doc: Excluded the QML documentation from the Qt-only set.David Boddie2010-07-163-0/+21
| | * | | | | | | | | | | | | | Doc: Whitespace fixes.David Boddie2010-07-162-57/+57
| | * | | | | | | | | | | | | | Doc: Fixed whitespace issues.David Boddie2010-07-162-25/+25
| | * | | | | | | | | | | | | | Doc: Reviewed Michael's model/view tutorial and overview document.David Boddie2010-07-1319-376/+564
| | * | | | | | | | | | | | | | Doc: Removed accidentally committed file.David Boddie2010-07-091-0/+0
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-0917-73/+100
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1