summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-197-36/+74
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix to incorrect ApplicationActivate event in QtOpenGLJani Hautakangas2011-12-166-33/+69
| | * | | | | | Symbian - Fix QFile::map with non page aligned offsetsShane Kearns2011-12-151-3/+5
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-191-1/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix a bug where 'int' is not printed in snippets.Casper van Donderen2011-12-191-1/+2
|/ / / / / / /
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-161-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixes to czech translationPavel Fric2011-12-161-4/+4
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-161-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-151-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Symbian: fix tst_QMenuBar::task256322_highlight() regressionSatyam Bandarapu2011-12-151-0/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-156-243/+1472
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Update czech translationPavel Fric2011-12-154-88/+774
| * | | | | | | I18n: Updates galician translation (4.8)Marcelino Villarino2011-12-132-155/+698
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-12-151-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-12-1525-319/+714
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-12-1525-319/+714
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |