summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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/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
| * | | | | | | | | | | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
| * | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221980-72198/+158783
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | / / / / / / / | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Create unit-test in parent directory.Aaron McCarthy2010-02-193-1/+12
| * | | | | | | | | | | | 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-1758-388/+703
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| * | | | | | | | | | | | | Fix QNetworkSession unit test.Aaron McCarthy2010-02-163-10/+14
| * | | | | | | | | | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| * | | | | | | | | | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| * | | | | | | | | | | | | Make this a warning.Aaron McCarthy2010-02-161-2/+2
| * | | | | | | | | | | | | 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-152-8/+50
| * | | | | | | | | | | | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| * | | | | | | | | | | | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-152-4/+38
| * | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-142686-3162/+320692
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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