summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-0543-1066/+2835
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
| |\
| | * Fix outdated testsAlan Alpert2011-01-0510-130/+1779
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-043-1/+51
| |\
| | * Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| | * Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-049-11/+81
| |\ \
| | * | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| | * | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| | * | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | * | QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| | * | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-042-1/+28
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0420-923/+923
| |\ \ \
| | * | | Update visual testsAlan Alpert2011-01-0420-923/+923
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-041-1/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-041-0/+2
|\ \ \
| * | | Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)Prasanth Ullattil2011-01-041-0/+2
* | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2011-01-0414-41/+694
|\ \ \ \
| * | | | Fix link error on MacOSShane Kearns2011-01-041-3/+3
| * | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-3114-41/+694
| |\ \ \ \
| | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-3014-41/+694
| | |\ \ \ \
| | | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-3014-41/+694
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2414-41/+694
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2414-41/+694
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2314-41/+694
| | | | | | |\ \ \ \
| | | | | | | * | | | Fix qfile test crash with glibcShane Kearns2010-12-221-6/+9
| | | | | | | * | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2214-41/+691
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Fix qfile test errorsShane Kearns2010-12-211-3/+39
| | | | | | | | * | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2114-41/+655
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2114-41/+655
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | Update def filesShane Kearns2010-12-206-19/+237
| | | | | | | | | | * | | | Add autotests for AutoCloseHandle / DontCloseHandle and RFile adoptionShane Kearns2010-12-202-10/+141
| | | | | | | | | | * | | | QFile API: add API to specify if adopted file handles should be closedShane Kearns2010-12-206-12/+277
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Set no brush when the brush is a solid patern transparent color.Pierre Rossi2011-01-041-0/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Fixed networkselftest failing to resolve hostnameRohan McGovern2010-12-301-1/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-301-0/+8
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | _ / / / / / / / | | / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-291-0/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clear WSERV content when a native child receives an "expose"Jason Barron2010-12-291-0/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-309-43/+223
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | tst_qmessagebox: fix `about' test on macRohan McGovern2010-12-301-0/+12
| * | | | | | | | tst_qmessagebox: make the failure message better for detailsButtonTextRohan McGovern2010-12-301-2/+1
| * | | | | | | | tst_qmessagebox: simulate key events more robustlyRohan McGovern2010-12-301-32/+71
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-249-11/+141
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-249-11/+141
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |