Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7 | Olivier Goffart | 2010-08-09 | 2 | -1/+8 |
|\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix link error when building Bearer application with Qt Mobility | Alex | 2010-08-05 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | compilation with QT_NO_DEPRECATED | Olivier Goffart | 2010-08-06 | 1 | -0/+2 |
|/ | | | | Reviewed-by: Andreas Kling | ||||
* | Return 'Unknown' bearer type name for unknown bearer type. | Aaron McCarthy | 2010-08-03 | 2 | -2/+2 |
| | |||||
* | Use an enum to return the bearer type of a network configuration. | Aaron McCarthy | 2010-08-02 | 4 | -29/+114 |
| | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex | ||||
* | Rename QNetworkConfiguration::bearerName() function. | Aaron McCarthy | 2010-08-02 | 2 | -9/+21 |
| | | | | | | | | | | | 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 | ||||
* | Cherry pick fix for MOBILITY-1077 from Qt Mobility. | Aaron McCarthy | 2010-07-27 | 1 | -4/+8 |
| | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66 | ||||
* | Order network configurations in service networks in priority order. | Aaron McCarthy | 2010-07-23 | 2 | -9/+13 |
| | | | | | | | | 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> | ||||
* | Don't poll non-polling engines when configurations are in use. | Aaron McCarthy | 2010-06-03 | 1 | -2/+4 |
| | |||||
* | Fix QT_NO_LIBRARY | Tasuku Suzuki | 2010-04-29 | 1 | -0/+4 |
| | | | | | | | | | 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> | ||||
* | Remove redundant network configuration updates on startup. | Aaron McCarthy | 2010-04-20 | 1 | -1/+1 |
| | | | | | The initial list of network configurations was being fetched twice when the bearer management plugins are loaded. | ||||
* | Introduce a qconfig feature for Bearer Management | Tasuku Suzuki | 2010-04-15 | 11 | -1/+43 |
| | | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com> | ||||
* | Remove holes in bearer management data structures. | Aaron McCarthy | 2010-04-15 | 5 | -14/+23 |
| | |||||
* | Bearer management changes from Qt Mobility (7a5ff985) | Aaron McCarthy | 2010-04-14 | 1 | -0/+4 |
| | | | | 7a5ff9859f5775915ae80c287f51c772599c2379 | ||||
* | Remove leading whitespace from Qt header macros. | Thiago Macieira | 2010-03-31 | 3 | -23/+23 |
| | | | | | | | 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 | ||||
* | MONILITY-645 | Wolfgang Beck | 2010-03-30 | 3 | -18/+63 |
| | | | | Merging bearer header. | ||||
* | Compile with QT_NO_NETWORKINTERFACE defined. | Aaron McCarthy | 2010-03-25 | 5 | -3/+7 |
| | |||||
* | Bearer management documentation. | Aaron McCarthy | 2010-03-24 | 3 | -3/+3 |
| | | | | Add overview and examples from Qt Mobility. | ||||
* | Bearer management changes from Qt Mobility (6fb31d1e). | Aaron McCarthy | 2010-03-24 | 1 | -1/+1 |
| | | | | 6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40. | ||||
* | Fix build failure on WinCE. | Aaron McCarthy | 2010-03-22 | 1 | -0/+4 |
| | |||||
* | Revert "Don't emit open signal on session close/error." | Aaron McCarthy | 2010-03-19 | 2 | -5/+8 |
| | | | | This reverts commit 39818f933b958d504b9cc18487658209d1df22da. | ||||
* | Don't emit open signal on session close/error. | Aaron McCarthy | 2010-03-19 | 2 | -8/+5 |
| | |||||
* | Add flag to indicate that network sessions are expected on a platform. | Aaron McCarthy | 2010-03-18 | 2 | -1/+4 |
| | |||||
* | Make destructor virtual. | Aaron McCarthy | 2010-03-18 | 1 | -1/+1 |
| | |||||
* | Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. | Aaron McCarthy | 2010-03-11 | 6 | -195/+285 |
| | |||||
* | Merge remote branch 'staging/4.7' into bearermanagement/polling | Aaron McCarthy | 2010-03-05 | 1 | -1/+1 |
|\ | |||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-03-02 | 1 | -1/+1 |
| | | |||||
* | | Don't keep polling network sessions open indefinitely. | Aaron McCarthy | 2010-03-05 | 1 | -0/+14 |
| | | |||||
* | | Prefer ethernet over wlan. | Aaron McCarthy | 2010-03-04 | 1 | -18/+51 |
| | | | | | | | | | | Change how the defaultConfiguration is calculated when one is not provided by an engine. | ||||
* | | Updating polling mechanism for bearer management engines. | Aaron McCarthy | 2010-03-04 | 5 | -7/+147 |
|/ | | | | | | | 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. | ||||
* | Bearer management changes from Qt Mobility (fca9891). | Aaron McCarthy | 2010-03-02 | 3 | -1/+9 |
| | | | | fca98911b75ce12e70d93cfc2932a9759758a605 | ||||
* | Change initialization order. | Aaron McCarthy | 2010-02-22 | 1 | -1/+1 |
| | |||||
* | Add locking to bearer code. | Aaron McCarthy | 2010-02-22 | 6 | -102/+136 |
| | | | | | QNetworkConfigurationManagerPrivate and QBearerEngine derived classes need to be thread-safe. | ||||
* | Don't block forever if no bearer plugins are loaded. | Aaron McCarthy | 2010-02-16 | 1 | -0/+5 |
| | |||||
* | Add QT_MODULE headers. | Aaron McCarthy | 2010-02-15 | 3 | -0/+6 |
| | |||||
* | Change docs: "phone" -> "device". | Aaron McCarthy | 2010-02-15 | 1 | -1/+1 |
| | |||||
* | Remove unused code. | Aaron McCarthy | 2010-02-15 | 2 | -59/+0 |
| | |||||
* | Simplify. | Aaron McCarthy | 2010-02-15 | 1 | -2/+1 |
| | |||||
* | Optimise iterations over QHash. | Aaron McCarthy | 2010-02-15 | 3 | -34/+41 |
| | |||||
* | Use snippets. | Aaron McCarthy | 2010-02-15 | 1 | -8/+1 |
| | |||||
* | Fix build on Windows. | Aaron McCarthy | 2010-02-12 | 1 | -1/+0 |
| | | | | | On Windows interface is #defined to struct. Make sure that qnetworksession.h is included before qplatformdefs.h. | ||||
* | Add 'We mean it.' header. | Aaron McCarthy | 2010-02-11 | 1 | -2/+13 |
| | |||||
* | Use provided typedef for QNetworkConfigurationPrivatePointer. | Aaron McCarthy | 2010-02-11 | 3 | -12/+9 |
| | |||||
* | Fix public includes. | Aaron McCarthy | 2010-02-11 | 6 | -6/+5 |
| | |||||
* | Tag new classes as since 4.7. | Aaron McCarthy | 2010-02-11 | 3 | -0/+6 |
| | |||||
* | Update copyright year to 2010. | Aaron McCarthy | 2010-02-11 | 5 | -5/+5 |
| | |||||
* | Convert Maemo6 backend into plugin. | Aaron McCarthy | 2010-02-10 | 10 | -2406/+19 |
| | |||||
* | Only add generic engine when it is available. | Aaron McCarthy | 2010-02-08 | 1 | -1/+2 |
| | |||||
* | Calculate default configuration if one is not provided by engines. | Aaron McCarthy | 2010-02-08 | 1 | -1/+61 |
| | |||||
* | Remove remaining Network Manager ifdef'ed code from common code. | Aaron McCarthy | 2010-02-08 | 1 | -2/+0 |
| |