summaryrefslogtreecommitdiffstats
path: root/src/network/bearer
Commit message (Collapse)AuthorAgeFilesLines
* Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changesetCristiano di Flora2011-02-221-1/+1
|
* Fix QNetworkConfigurationManager crash due to null private pointer.Cristiano di Flora2011-02-221-12/+5
| | | | | Reviewed-by: Aaron McCarthy Task-Number: QTBUG-17305
* Fix warning about QLatin1String::operator==(const char*) deprecatedThiago Macieira2011-02-211-2/+2
| | | | Use qstrcmp instead.
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-102-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Fixed compilerwarnings regression in public headers.axis2011-02-081-2/+2
| | | | | | | | RevBy: Trust me
| * Fix namespace errorShane Kearns2011-02-071-3/+3
| | | | | | | | Reviewed-by: Olivier Goffart
| * Fix random crashes when bearer suddenly goes downShane Kearns2011-02-042-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 1. QNetworkSession being deleted from the closed signal caused data abort or E32User-CBase 49 panics. (both observed) 2. Potential E32User-CBase 46 panic in ConnectionProgressNotifier::StartNotifications() Reviewed-by: Aaron Tunney Reviewed-By: Markus Goetz Task-Number: QTBUG-17196
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-253-2/+175
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Workaround crash when multiple QNetworkAccessManager instances are usedShane Kearns2011-01-143-2/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of each QNetworkAccessManager owning a QNetworkSession, they now share a QNetworkSession if they have the same QNetworkConfiguration. QNetworkAccessManager now uses passive roaming instead of application level roaming. The state change signal (entering connected state) is used to indicate reconnection instead of being triggered when sending an ALR accept(). This preserves the previous behaviour, as QNAM always accepted the suggested access point from bearer mobility. In the case of multithreaded applications, one QNetworkSession will be created for each thread which uses QNetworkAccessManager, as QNetworkSession is not thread safe. Task-number: QT-4378 Reviewed-by: Markus Goetz Reviewed-by: juhvu
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1714-14/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1014-14/+14
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | 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
* | remove useless overloadKonstantin Ritt2010-12-101-2/+2
| | | | | | | | | | | | | | sinse create(QString()) always returns 0 Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* | simplify polling code a bitKonstantin Ritt2010-12-102-33/+8
| | | | | | | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* | promote QNetworkConfigurationManager::updateConfigurations() to a slotKonstantin Ritt2010-12-101-1/+3
| | | | | | | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* | simplify waitForOpened()Konstantin Ritt2010-12-101-9/+6
| | | | | | | | | | | | | | 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>
* | fix CV-qualifiers for some membersKonstantin Ritt2010-12-102-13/+13
| | | | | | | | | | | | | | | | 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>
* | minor clean-ups and styling fixesKonstantin Ritt2010-12-1015-186/+145
|/ | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix crash on exit.Aaron McCarthy2010-10-191-8/+30
| | | | | | | | | 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
* doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | | | | | Don\t use \i for italics. Use \e. Task: QTBUG-14133
* Fix memory leaks and valgrind errors.Aaron McCarthy2010-09-131-0/+3
|
* Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-011-1/+22
| | | | | | | | | 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
* Fix race condition on bearer management initialisation.Aaron McCarthy2010-08-242-5/+17
| | | | | | | Defer initialisation and changing thread affinity until after the global static is constructed. Task-number: QTBUG-12686
* Merge remote branch 'staging/4.7' into bearermanagement/maemo-fixesAaron McCarthy2010-08-163-13/+8
|\
| * Make this constructor explicit in Qt too.Aaron McCarthy2010-08-131-4/+0
| |
| * Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-132-9/+8
| | | | | | | | Wrap new APIs in ifndef QT_MOBILITY_BEARER.
* | Register QNetworkConfigurationPrivatePointer metatype.Aaron McCarthy2010-08-161-0/+1
|/
* Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-092-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 MobilityAlex2010-08-052-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_DEPRECATEDOlivier Goffart2010-08-061-0/+2
|/ | | | Reviewed-by: Andreas Kling
* Return 'Unknown' bearer type name for unknown bearer type.Aaron McCarthy2010-08-032-2/+2
|
* Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-024-29/+114
| | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-022-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 McCarthy2010-07-271-4/+8
| | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-232-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 McCarthy2010-06-031-2/+4
|
* Fix QT_NO_LIBRARYTasuku Suzuki2010-04-291-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 McCarthy2010-04-201-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 ManagementTasuku Suzuki2010-04-1511-1/+43
| | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Remove holes in bearer management data structures.Aaron McCarthy2010-04-155-14/+23
|
* Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-141-0/+4
| | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* Remove leading whitespace from Qt header macros.Thiago Macieira2010-03-313-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-645Wolfgang Beck2010-03-303-18/+63
| | | | Merging bearer header.
* Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-255-3/+7
|
* Bearer management documentation.Aaron McCarthy2010-03-243-3/+3
| | | | Add overview and examples from Qt Mobility.
* Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-241-1/+1
| | | | 6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
* Fix build failure on WinCE.Aaron McCarthy2010-03-221-0/+4
|
* Revert "Don't emit open signal on session close/error."Aaron McCarthy2010-03-192-5/+8
| | | | This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
* Don't emit open signal on session close/error.Aaron McCarthy2010-03-192-8/+5
|