summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-248-13/+22
|\
| * suppress pointer aliasing warningsOswald Buddenhagen2010-02-241-3/+6
| * Fix compilation with namespace.ck2010-02-241-0/+1
| * 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-2424-57/+124
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2424-57/+124
| |\
| | * Add -mediaservice argument to configure.Andrew den Exter2010-02-241-11/+13
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2323-46/+111
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2323-46/+111
| | | |\
| | | | * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | * 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-232-0/+15
* | | | | | 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-2474-13/+14852
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2374-13/+14852
| |\ \ \ \
| | * | | | 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-2274-13/+14835
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | | |/ / / | | |/| | |
| | * | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| | * | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
| | * | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221121-65649/+109503
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| | * | | | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20
| | * | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1715-74/+86
| | |\ \ \ \
| | * | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| | * | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | * | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| | * | | | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| | * | | | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
| | * | | | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
| | * | | | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
| | * | | | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
| | * | | | | Simplify.Aaron McCarthy2010-02-151-2/+1
| | * | | | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
| | * | | | | Use snippets.Aaron McCarthy2010-02-151-8/+1
| | * | | | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| | * | | | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-4/+29
| | * | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14340-163/+106772
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'laptop/bearermanagement/integration' into bearermanagement/inte...Aaron McCarthy2010-02-126-4/+5
| | |\ \ \ \ \ \
| | | * | | | | | Fix build on Windows, typo.Aaron McCarthy2010-02-121-1/+1
| | | * | | | | | Fix build on Windows.Aaron McCarthy2010-02-125-3/+4
| | * | | | | | | Merge remote branch 'staging/master' into bearermanagement/integrationAaron McCarthy2010-02-122-3/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-12129-213/+15035
| | | |\ \ \ \ \ \