Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -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 McDonald | 2011-01-10 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | minor clean-ups and styling fixes | Konstantin Ritt | 2010-12-10 | 1 | -3/+4 |
|/ | | | | | Merge-request: 899 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com> | ||||
* | Introduce a qconfig feature for Bearer Management | Tasuku Suzuki | 2010-04-15 | 1 | -0/+3 |
| | | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com> | ||||
* | Missed this in a previous commit. | Aaron McCarthy | 2010-02-08 | 1 | -1/+1 |
| | |||||
* | Remove remaining Network Manager ifdef'ed code from common code. | Aaron McCarthy | 2010-02-08 | 1 | -0/+4 |
| | |||||
* | Rename internal QNetworkSessionEngine* to QBearerEngine*. | Aaron McCarthy | 2010-02-08 | 1 | -0/+77 |