| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Task-number: QTBUG-8456
|
|\ |
|
| |
| |
| |
| |
| | |
Allows loading/decoding local images in an asynchronous thread (already
the case for network images).
|
| |
| |
| |
| | |
Reviewed-by: akennedy
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
in the "onFooChanged" form, even if the notify signal is not called
"fooChanged".
Task-number: QT-2783
|
| | | |
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | | |
to QDeclarativeXXX.
|
| | | |
|
| |/ |
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
...
|
| | | |
|
| | |\ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (120 commits)
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.
Simplify.
...
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (118 commits)
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.
Simplify.
Optimise iterations over QHash.
Use snippets.
...
|
| | | |/ / / /
| | |/| | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Don't use an app bundle for this helper app.
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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.
...
|
| | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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.
...
|
| | | | | |\ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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.
...
|
| | | | | | |\ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
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.
...
|
| | | | | | | |\ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
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.
...
|
| | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
QNetworkConfigurationManagerPrivate and QBearerEngine derived classes
need to be thread-safe.
|
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | | | | | | | / / / / / /
| | | |_|_|_|_|/ / / / / /
| | |/| | | | | | | | | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| | | | | | | | | | | | | |
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
QNetworkConfigurationManager cannot be loaded before QApplication as the
plugins it loads may create timers. Which fail because timers can only
be created in threads created with QThread.
|
| | | | | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
The NLA plugin locks up on exit for some programs, though not all.
Disable for now until cause is found.
Always build generic plugin on win32 and mac.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Make sure test can find lackey process.
Always connect lackey to tests IPC socket.
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
manager may be 0.
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | | |
|