diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 21:15:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 21:15:18 (GMT) |
| commit | 4c78ca75016fcc71cea8d1ba8b43cfd5d979b3e4 (patch) | |
| tree | 172a91fcf79ca6ece01d08cf01807a6a5ccf30e8 /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
| parent | 9a099b6408169b3e6f30ffd2e4866d7af31e49c9 (diff) | |
| parent | f1671303b3da7cfe8532699541ae8dd41e122f8e (diff) | |
| download | Qt-4c78ca75016fcc71cea8d1ba8b43cfd5d979b3e4.zip Qt-4c78ca75016fcc71cea8d1ba8b43cfd5d979b3e4.tar.gz Qt-4c78ca75016fcc71cea8d1ba8b43cfd5d979b3e4.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: (114 commits)
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.
Simplify.
Optimise iterations over QHash.
Use snippets.
Reorder members to remove hole.
Expand documentation for QNAM::setConfiguration() and friends.
Fix build on Windows, typo.
Fix build on Windows.
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions