summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added warning if <QGLFunctions> is included when GLEW is present.Samuel Rødal2011-01-052-0/+7
* 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
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-249-11/+141
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-225-1/+24
| | | * | | | | | | Added int overloads to QPoint operator* and operator*=.Samuel Rødal2010-12-222-9/+92
| | | * | | | | | | tst_qmessagebox: add debug to know why it failsOlivier Goffart2010-12-221-1/+3
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-212-1/+23
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | QMessageBox wrong Show/Hide Details button labelRaul Metsma2010-12-212-1/+23
| | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-244-42/+106
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-244-42/+106
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | | | | _ / / / | | | | | / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-231-6/+18
| |\ \ \ \ \ \ \
| | * | | | | | | Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-233-36/+88
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add Postgresql 8.x and 9 supportsCharles Yin2010-12-233-36/+88
| | |/ / / / / / /
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-2446-550/+3199
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-2346-550/+3199
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2346-550/+3199
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |