summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0Zeno Albisser2012-01-063-4/+4
* Fix crash when creating a QScriptEngine in a native threadSimon Hausmann2012-01-051-1/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2012-01-040-0/+0
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2012-01-04358-1403/+1607
| |\ | |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2012-01-0398-328/+411
|\ \
| * \ Merge remote branch 'dev-codereview/4.8' into qa-staging-masterRohan McGovern2012-01-0398-328/+411
| |\ \ |/ / /
| * | tests: eliminated usage of qttest_p4.prf [part 3]Sergio Ahumada2011-12-2933-120/+143
| * | tests: eliminated usage of qttest_p4.prf [part 2]Sergio Ahumada2011-12-2966-209/+269
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2012-01-026-21/+24
|\ \ \
| * \ \ Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2012-01-026-21/+24
| |\ \ \
| | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-292251-92314/+61467
| | |\ \ \
| | | * | | Adapt autotests to commit e2773a9Kai Koehne2011-11-293-6/+6
| | | * | | Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-283-3/+3
| | | * | | Declarative: Unify output of warning messages in debug serverKai Koehne2011-11-281-12/+15
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-12-311-0/+2
|\ \ \ \ \ \
| * | | | | | Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"Sergio Ahumada2011-12-311-44/+0
| * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-12-301-0/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-12-301-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Doc: Add `-xunitxml' option to qtestlib documentationSergio Ahumada2011-12-301-0/+2
| | |/ / / / / /
| * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-12-302-1/+45
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-12-161-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-12-072-0/+50
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAnySami Rosendahl2011-12-072-0/+50
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-302-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Also correctly apply stack size difference in MSVC2008Casper van Donderen2011-12-301-2/+2
| * | | | | | | | | Add a default alt attribute to img tags.Casper van Donderen2011-12-301-0/+2
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-29102-35/+155
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-28102-35/+155
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2011-12-28102-35/+155
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-26105-247/+308
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-26105-247/+308
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tests: eliminated usage of qttest_p4.prfSergio Ahumada2011-12-25105-247/+308
| |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-2333-703/+673
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-2212-677/+634
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Revert variable overwritten by copying from Qt5Casper van Donderen2011-12-221-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-12-221-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | New style sheet for offline (QCH) documentationCasper van Donderen2011-12-2212-678/+635
| * | | | | | | | | | | New style sheet for offline (QCH) documentationCasper van Donderen2011-12-2212-677/+634
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-2220-19/+34
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-2118-18/+25
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Symbian: Fix exporting and importing of some functions for autotestsMiikka Heikkinen2011-12-2116-17/+17
| | * | | | | | | | | | | Symbian: Fix SRCDIR usage in qlayout autotest.Miikka Heikkinen2011-12-211-0/+4
| | * | | | | | | | | | | Symbian: Fix qcssparser autotestMiikka Heikkinen2011-12-211-1/+4
| * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-212-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Symbian: Fix qscriptextensionplugin autotestMiikka Heikkinen2011-12-212-1/+9
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-2238-80/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-2138-80/+41
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | selftests: eliminated usage of qttest_p4.prfSergio Ahumada2011-12-2138-80/+41
| * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-2160-648/+2421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /