summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-081-2/+5
|\
| * Disabled tst_MakeTestSelfTest::make_check by default on mac.Rohan McGovern2010-06-071-2/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-088-33/+172
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-078-33/+172
| |\ \ |/ / /
| * | New keys for media-related keys, common mobile keysIain2010-06-073-18/+45
| * | Retrieve proper glyph outlines from Symbian^4Alessandro Portale2010-06-072-2/+103
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-073-13/+24
| |\ \ | | |/ | |/|
| | * Make Fluidlauncher demo have same version as corresponding QtMiikka Heikkinen2010-06-071-0/+1
| | * Fix the building of sis files.Thomas Zander2010-06-071-5/+5
| | * Make symbian install to epocroot by default.Thomas Zander2010-06-071-8/+18
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0719-12/+180
|\ \ \ | |/ / |/| |
| * | Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8Simon Hausmann2010-06-0719-12/+180
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-071-1/+1
|\ \
| * | Fixed `make install' for qmediaplayer demo.Rohan McGovern2010-06-071-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-079-45/+56
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-059-45/+56
| |\ |/ /
| * Merge branch 'def_files_and_plugins' into 4.7-s60axis2010-06-049-45/+56
| |\
| | * Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-048-39/+45
| | * Fixed def file usage for the makefile build system on the SDK plugin.axis2010-06-041-6/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-047-41/+269
|\ \ \
| * | | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-047-41/+269
| |\ \ \
| | * | | Skip tst_maketestselftest::make_check by default on WindowsRohan McGovern2010-06-041-0/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-037-41/+266
| | |\ \ \
| | | * | | Fixed tst_maketestselftest on QWS and Windows.Rohan McGovern2010-06-033-5/+26
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-037-41/+245
| | | |\ \ \
| | | | * | | Add a test for the `make check' feature.Rohan McGovern2010-06-025-6/+179
| | | | * | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| | | | * | | Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0416-20/+668
|\ \ \ \ \ \ \
| * | | | | | | Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647Simon Hausmann2010-06-044-4/+20
| * | | | | | | Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80Simon Hausmann2010-06-0416-18/+650
| |/ / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-0413-5307/+9657
|\ \ \ \ \ \ \
| * | | | | | | Synchronizing to latest treeGarami Gábor2010-06-047-444/+1096
| * | | | | | | Adding correct hungarian translationGarami Gábor2010-06-048-5244/+8928
| * | | | | | | Search local directory if no qconfig file found in src/corelib/global/Tasuku Suzuki2010-06-041-2/+8
| * | | | | | | Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-042-1/+4
| * | | | | | | Fix QT_NO_ACTIONTasuku Suzuki2010-06-042-1/+6
| |/ / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0417-244/+267
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add a note to the Linguist docs stating XLIFF 1.0 is not supportedAndy Shaw2010-06-041-2/+7
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0416-242/+260
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
| | * | | | | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-0311-186/+178
| | * | | | | Styled item view backgrounds in Gtk+Jens Bache-Wiig2010-06-031-15/+41
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-0368-969/+1221
| | |\ \ \ \ \
| | * | | | | | Ensure that we only have one QLayoutStruct struct by renaming the otherAndy Shaw2010-06-031-29/+29
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-0460-23/+339
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | tst_qgraphicsitem: stabilize on X11Olivier Goffart2010-06-031-0/+1
| * | | | | | | Added OpenGL 3.3 and 4.0 recognition to QGLFormatSebastian Hartte2010-06-032-3/+23
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-0357-20/+315
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |