summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| | | * | | | | | Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-062-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | QHostInfoCache: Use QElapsedTime instead of QTimeNiklas Kurkisuo2011-01-062-3/+3
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-061-0/+246
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | tst_qscriptclass: backport test from the v8 branchOlivier Goffart2011-01-061-0/+246
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-061-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Cocoa: add support for QEventLoop::ExcludeUserInputEventsRichard Moe Gustavsen2011-01-061-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-0543-1066/+2835
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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/qt-releng-staging into mas...Qt Continuous Integration System2011-01-053-30/+72
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'qt-releng-review/master'Eckhart Koppen2011-01-053-30/+72
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-051-0/+47
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Added patch for temporary support for --listgen option in qmakeEckhart Koppen2011-01-051-0/+47
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-052-30/+25
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fixed broken configuration step for Symbian buildsEckhart Koppen2011-01-042-30/+25
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-052-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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