summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-263-3/+3
* simplify string opsOswald Buddenhagen2010-02-261-1/+1
* sanitize evaluation of OS scopesOswald Buddenhagen2010-02-261-13/+14
* instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-263-4/+2
* add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-266-14/+44
* fix ts-assistant targetOswald Buddenhagen2010-02-251-1/+1
* use QList::reserve() as appropriateOswald Buddenhagen2010-02-252-0/+6
* optimize appending of (empty) lists to (empty) listsOswald Buddenhagen2010-02-251-9/+16
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2417-512/+1449
|\
| * suppress pointer aliasing warningsOswald Buddenhagen2010-02-241-3/+6
| * Fix compilation with namespace.ck2010-02-241-0/+1
| * Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| * Prepare German translations for 4.7 (except Quick).Friedemann Kleint2010-02-245-488/+1416
| * tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
| * Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-246-10/+15
* | 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
* | | | | | 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
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-191227-17914/+115112
| | | | | | | |\ \ \ \ \ \ \
| * | | | | | | | | | | | | | Increase try verify timeout.Aaron McCarthy2010-02-222-2/+2