| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
| |
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The bearer management API was integrated into QtNetwork 4.7
This change removes the parallel implementation from QtBearer
and inserts a shim for binary compatibility.
Applications which linked against QtBearer will now be using the
implementation from QtNetwork transparently.
QNetworkSession had a private 'd' pointer, the private class is changed
to contain a ::QNetworkSession, and API calls are redirected.
Signals are connected to the signals of the outer class, or through
translation slots of the inner class where casting is required.
QNetworkConfigurationManager had no 'd' pointer, but a global static
private implementation.
This is similarly changed to contain a ::QNetworkConfigurationManager
which is used to redirect API calls.
Qt's meta object system can't distinguish between QNetworkConfiguration
and QtMobility::QNetworkConfiguration. This is because the signals in
QtBearer were declared without including the namespace in the parameters.
MOC doesn't understand c++ namespaces properly.
As QVariants can be cast to the wrong type, a different approach is taken
for QNetworkConfiguration to avoid crashes when using QSignalSpy or queued
connections.
QNetworkConfiguration now derives from ::QNetworkConfiguration.
The QNetworkConfiguration 'd' pointer is removed (the Qt class has a 'd'
pointer)
This makes the two classes bitwise identical except for the vtable
for the virtual destructor.
QtMobility::QNetworkConfiguration APIs just base-call the Qt class.
There is a new private constructor to allow a
QtMobility::QNetworkConfiguration to be constructed from a Qt one.
The two virtual adaptor classes exist to avoid namespace conflicts
QtBearer no longer exports any header files.
This version of QtBearer has a dependency on Qt 4.7 or higher, and the
Qt headers include the QtMobility version of the API already.
Exporting the QtBearer headers causes compile errors in case an application
picked up the wrong header files.
Testing:
Ran qt bearer autotests on symbian3, compiled and run against
qt 4.8 and this version of qt mobility.
Ran qt bearer autotests on symbian3, compiled against qt 4.6.3 and
qt mobility 1.0.2; run against qt 4.8 and this version of qt mobility.
Also ran these same tests with win32-msvc2008 and linux-gcc desktop platforms.
|
| |
|
|
|
|
|
| |
Updated version of LGPL licenseheader.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
src/bearer/qnetworkconfigmanager_maemo.cpp
|
| | |
| |
| |
| | |
ifdefs match up
|
| |/ |
|
| |
|
|
| |
adds proper defines and CONFIG flags
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bearer/bearer.pro
examples/bearercloud/bearercloud.pro
examples/bearermonitor/bearermonitor.pro
tests/tests.pro
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | | |
|
| |\ \
| |/
|/|
| | |
issues have been resolved)
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
deprecated) in order to hide gconf details.
Statistics support added to QNetworkSession class
QNetworkConfigurationManager::updateConfigurations() internal logic fixed
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| |
|
