summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-2572-483/+1015
|\
| * Better check in QStaticText testcase if xformed text is supportedGunnar Sletta2010-02-251-5/+12
| * Fix point drawing in QPainter.Gunnar Sletta2010-02-251-1/+1
| * Merge remote branch 'origin/master'Olivier Goffart2010-02-2433-57/+175
| |\ | |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2432-62/+181
|\ \
| * | QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2431-61/+180
| |\ \
| | * | Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
| | * | Add -mediaservice argument to configure.Andrew den Exter2010-02-244-14/+43
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | | |\ \
| | | | * | Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | * | Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2318-28/+212
| | | | |\ \
| | | | | * | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-234-4/+4
| | | | | * | Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | * | | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-241-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
| | | | | | * Expand indicator would not be displayed after removal of a collapsed item's c...Gabriel de Dietrich2010-02-242-4/+23
| | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-243-27/+28
| | | | | | |\
| | | | | | | * Doc: fix formattingaavit2010-02-241-22/+22
| | | | | | | * Make the qpainter test compile under Windows.Trond Kjernaasen2010-02-241-2/+3
| | | | | | | * make QtScript compatible with mingw 64Thierry Bastian2010-02-241-3/+3
| | | | | | * | Avoid always detaching QStaticTextEskil Abrahamsen Blomfeldt2010-02-241-2/+0
| | | | | | |/
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-243587-289712/+160111
| | | | | | |\
| | | | | | | * Add licence headerOlivier Goffart2010-02-241-0/+41
| | | | | | | * Fixed a warning.Trond Kjernåsen2010-02-241-1/+1
| | | | | | | * WinCE compilation fixaavit2010-02-241-1/+1
| | | | | | | * Fixed hypersensitive drag on QHeaderViewsGabriel de Dietrich2010-02-241-7/+2
| | | | | | | * Fix seg-fault when no X11 desktop environment is presentTom Cooksey2010-02-241-23/+53
| | | | | | | * Remove comment in drawStaticTextItem() in GL engineEskil Abrahamsen Blomfeldt2010-02-241-1/+0
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-24149-324/+23645
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-24131-117/+23094
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| * | | | | | | Merge remote branch 'staging/master' into bearermanagement/stagingAaron McCarthy2010-02-23127-2086/+2417
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-23131-117/+23094
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-232-1/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-23277-2687/+2419
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| * | | | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-22131-117/+23077
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| * | | | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | |\ \ \ \ \ \ \ \ \