summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/qbearerengine_impl.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | minor clean-ups and styling fixesKonstantin Ritt2010-12-101-3/+4
|/ | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Introduce a qconfig feature for Bearer ManagementTasuku Suzuki2010-04-151-0/+3
| | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Missed this in a previous commit.Aaron McCarthy2010-02-081-1/+1
|
* Remove remaining Network Manager ifdef'ed code from common code.Aaron McCarthy2010-02-081-0/+4
|
* Rename internal QNetworkSessionEngine* to QBearerEngine*.Aaron McCarthy2010-02-081-0/+77