diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 01:17:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 01:17:43 (GMT) |
| commit | 4d615766184e3eeee25ffc634847bec1edd47ac0 (patch) | |
| tree | 24440f7229b35ba14f0981560dcae55ac8f65cff /src/multimedia/qml/qmlmediabase_p.h | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| parent | cfed63b7b8ef0be1d5da583b52b7e88902383e06 (diff) | |
| download | Qt-4d615766184e3eeee25ffc634847bec1edd47ac0.zip Qt-4d615766184e3eeee25ffc634847bec1edd47ac0.tar.gz Qt-4d615766184e3eeee25ffc634847bec1edd47ac0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (121 commits)
Make this function non-static.
Make compile on Maemo6.
Fix build on Symbian.
Change initialization order.
Increase try verify timeout.
Add locking to bearer code.
Fixed qnetworksession test on Mac.
Create unit-test in parent directory.
Allow QNAM to be created as a global variable.
Don't load NetworkManager plugin in NetworkManager is not available.
Disable NLA plugin, build generic on win32 and mac.
Fix QNetworkSession unit test.
Fix segfault.
Remove debug output.
Make this a warning.
Don't block forever if no bearer plugins are loaded.
Always build generic plugin when building NetworkManager plugin.
Add QT_MODULE headers.
Change docs: "phone" -> "device".
Remove unused code.
...
Diffstat (limited to 'src/multimedia/qml/qmlmediabase_p.h')
0 files changed, 0 insertions, 0 deletions