summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-211-7/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-2125-320/+1580
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | qnetworkproxy_mac.cpp was not compiled in on Mac for the network moduleAndy Shaw2011-12-211-7/+5
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-12-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-12-161-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-12-203-12/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SSL: fix build with -openssl-linked for OpenSSL 0.9.8*Peter Hartmann2011-12-193-12/+0
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-201-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add dita_docs target to generate DITA output.Casper van Donderen2011-12-201-1/+4
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-208-39/+80
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-192-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77Jani Hautakangas2011-12-191-0/+1
| | * | | | | | | | | | Fix m_longTapDetector causing crash.Jani Hautakangas2011-12-191-6/+8