| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When an active QNetworkConfiguration is already in use (e.g. browser
already open), the QNetworkSession::waitForOpened() did not work
properly. Changed one if-statement in the function to adapt to the
scenario.
Reviewed-by: Perttu Pohjonen
Task-number: QTBUG-565
|
| |
| |
| |
| |
| |
| |
| | |
sinse create(QString()) always returns 0
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
and don't exclude socket events so they might be used pings and so on...
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
this change is BC-safe since QNetworkConfigurationManagerPrivate
is not a part of a public API
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|/
|
|
|
| |
Merge-request: 899
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
If QNetworkConfigurationManager is deleted from the QApplication
destructor it will be deleted after QNetworkConfigurationManagerPrivate
global static (which is also deleted by QApplication). Fixed by testing
if connManager() returns 0 before use.
Task-number: QTBUG-14447
|
|
|
|
|
|
| |
Don\t use \i for italics. Use \e.
Task: QTBUG-14133
|
| |
|
|
|
|
|
|
|
|
|
| |
The order of global static destruction is not well defined. Ensure that
the QNetworkConfigurationManager global static is destroyed from the
QCoreApplication destructor before its dependencies are destroyed with
the rest of the global statics.
Task-number: QTBUG-13304
|
|
|
|
|
|
|
| |
Defer initialisation and changing thread affinity until after the
global static is constructed.
Task-number: QTBUG-12686
|
|\ |
|
| | |
|
| |
| |
| |
| | |
Wrap new APIs in ifndef QT_MOBILITY_BEARER.
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtMobility uses the Qt header when compiling applications which
link against Mobility's Bearer library. Therefore
QNetworkConfiguration::bearerName() cannot be inline and refer to the
new QNetworkConfiguration::bearerTypeName() function (which doesn't
exist in Mobility)
Task-number: QTBUG-12378
Reviewed-by: Rohan McGovern
|
|/
|
|
| |
Reviewed-by: Andreas Kling
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-12378
Reviewed-by: Alex
|
|
|
|
|
|
|
|
|
|
|
| |
bearerName() -> bearerTypeName().
bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.
Task-number: QTBUG-12378
Reviewed-by: Alex
|
|
|
|
|
| |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
|
|
|
|
|
|
|
|
| |
It is useful to know the priority order of the sub configurations of
a service network.
Task-number: QTBUG-11678
RevBy: juhvu <qt-info@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not
defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for
QFactoryLoader because LIBRARY depends on SETTINGS.
Merge-request: 578
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
|
|
|
|
| |
The initial list of network configurations was being fetched twice when
the bearer management plugins are loaded.
|
|
|
|
|
| |
Merge-request: 517
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
|
|
|
|
| |
7a5ff9859f5775915ae80c287f51c772599c2379
|
|
|
|
|
|
|
| |
The tst_headers::macros test doesn't like it. It's easier to remove
the spaces than to fix the test.
Reviewed-by: Markus Goetz
|
|
|
|
| |
Merging bearer header.
|
| |
|
|
|
|
| |
Add overview and examples from Qt Mobility.
|
|
|
|
| |
6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
|
| |
|
|
|
|
| |
This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
|
| |
|
| |
|
| |
|
| |
|
|\ |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Change how the defaultConfiguration is calculated when one is not
provided by an engine.
|
|/
|
|
|
|
|
| |
Improves the polling mechanism by sharing a single timer for all poll
based engines. Updates are only performed for a poll based engine iff a
QNetworkConfigurationManager object has been constructed or a
QNetworkConfiguration is held externally from the engine.
|
|
|
|
| |
fca98911b75ce12e70d93cfc2932a9759758a605
|
| |
|
|
|
|
|
| |
QNetworkConfigurationManagerPrivate and QBearerEngine derived classes
need to be thread-safe.
|