Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'BearerIntegration-4' into bearermanagement/integration-4 | Aaron McCarthy | 2010-01-29 | 4 | -6/+12 |
|\ | | | | | | | | | | | | | | | Conflicts: config.tests/unix/networkmanager/networkmanager.pro src/network/bearer/bearer.pro src/network/bearer/qnetworkconfiguration_s60_p.cpp tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro | ||||
| * | Bearer Management Integration 4. | Aaron McCarthy | 2010-01-29 | 5 | -15/+15 |
| | | |||||
* | | Return default configuration from engines. | Aaron McCarthy | 2010-01-26 | 4 | -26/+17 |
| | | |||||
* | | Connect up preferredConfigurationChanged() signal. | Aaron McCarthy | 2010-01-26 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'ares/mac/bearermanagement/integration' into ↵ | Aaron McCarthy | 2010-01-26 | 3 | -2/+14 |
|\ \ | | | | | | | | | | bearermanagement/integration | ||||
| * | | Make compile on Mac OS X. | Aaron McCarthy | 2010-01-20 | 3 | -2/+14 |
| | | | |||||
| * | | Make compile on Unix. | Aaron McCarthy | 2010-01-18 | 4 | -2/+22 |
| | | | |||||
* | | | Make compile on Windows. | Aaron McCarthy | 2010-01-18 | 6 | -4/+28 |
| | | | |||||
* | | | Make compile on Unix. | Aaron McCarthy | 2010-01-18 | 5 | -4/+26 |
|/ / | |||||
* | | Port session functionality. | Aaron McCarthy | 2010-01-18 | 18 | -420/+497 |
| | | |||||
* | | Partially convert Symbian backend into a plugin. | Aaron McCarthy | 2010-01-12 | 27 | -598/+460 |
| | | | | | | | | QNetworkSession functionality not converted yet. | ||||
* | | Return empty bearer name for invalid, ServiceNetwork and UserChoice. | Aaron McCarthy | 2010-01-11 | 1 | -1/+1 |
| | | |||||
* | | Make compile for Symbian. | Aaron McCarthy | 2010-01-07 | 5 | -9/+47 |
| | | |||||
* | | Fix build on Maemo, force type to qreal. | Aaron McCarthy | 2010-01-07 | 1 | -1/+2 |
| | | |||||
* | | Fix test compile failure when using frameworks on Mac OS X. | Aaron McCarthy | 2010-01-06 | 1 | -1/+1 |
| | | |||||
* | | Fix failures on Mac OS X after merge. | Aaron McCarthy | 2010-01-06 | 1 | -0/+3 |
| | | |||||
* | | Merge commit '554e022396eff5bd7b93e070cf9bbb3257945f0b' into ↵ | Aaron McCarthy | 2010-01-05 | 60 | -2880/+3234 |
|\ \ | |/ |/| | | | bearermanagement/integration-3 | ||||
| * | Fix failure on Windows after merge. | Aaron McCarthy | 2010-01-05 | 1 | -2/+3 |
| | | |||||
| * | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2 | Aaron McCarthy | 2010-01-05 | 60 | -2880/+3233 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/mac/corewlan/corewlan.pro examples/network/bearercloud/bearercloud.pro examples/network/bearermonitor/bearermonitor.pro src/network/bearer/bearer.pro src/network/bearer/qnativewifiengine_win.cpp src/network/bearer/qnetworkconfigmanager_p.cpp src/network/bearer/qnetworkconfiguration_s60_p.cpp src/network/bearer/qnetworksession.cpp src/network/bearer/qnetworksession_p.cpp src/network/bearer/qnmwifiengine_unix.cpp src/network/bearer/qnmwifiengine_unix_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/bearer/generic/qgenericengine.cpp src/plugins/bearer/nla/main.cpp src/plugins/bearer/nla/qnlaengine.cpp tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro tests/manual/bearerex/bearerex.pro tests/manual/networkmanager/networkmanager.pro | ||||
| | * | Remove some unused functions and debug output. | Aaron McCarthy | 2010-01-04 | 2 | -105/+2 |
| | | | |||||
| | * | Convert Core Wlan plugin to be incremental. | Aaron McCarthy | 2010-01-04 | 3 | -41/+220 |
| | | | |||||
| | * | Emit updateCompleted() when requestUpdate() is called. | Aaron McCarthy | 2010-01-04 | 2 | -0/+10 |
| | | | |||||
| | * | Fix memory leak in NLA engine. | Aaron McCarthy | 2010-01-04 | 1 | -9/+1 |
| | | | |||||
| | * | Remove bearer.pro. | Aaron McCarthy | 2010-01-04 | 1 | -163/+0 |
| | | | |||||
| | * | Remove unused BEARER_ENGINE preprocessor define. | Aaron McCarthy | 2010-01-04 | 9 | -33/+5 |
| | | | |||||
| | * | Convert Native Wifi plugin to be incremental. | Aaron McCarthy | 2010-01-04 | 3 | -30/+106 |
| | | | |||||
| | * | Convert NLA plugin to be incremental. | Aaron McCarthy | 2010-01-04 | 3 | -24/+95 |
| | | | |||||
| | * | Remove unused global statics. | Aaron McCarthy | 2010-01-04 | 7 | -32/+0 |
| | | | |||||
| | * | Rework NetworkManager backend. | Aaron McCarthy | 2010-01-04 | 17 | -1359/+863 |
| | | | |||||
| | * | Keep track of which QNetworkInterface is for each QNetworkConfiguration. | Aaron McCarthy | 2010-01-04 | 2 | -3/+5 |
| | | | |||||
| | * | Convert generic engine plugin to be incremental. | Aaron McCarthy | 2010-01-04 | 10 | -390/+266 |
| | | | |||||
| | * | Remove debug. | Aaron McCarthy | 2010-01-04 | 6 | -21/+0 |
| | | | |||||
| | * | Convert CoreWlan engine into a plugin. | Aaron McCarthy | 2010-01-04 | 9 | -58/+129 |
| | | | |||||
| | * | Update license headers. | Aaron McCarthy | 2009-12-22 | 3 | -3/+3 |
| | | | |||||
| | * | Fix license headers. | Aaron McCarthy | 2009-12-22 | 1 | -1/+1 |
| | | | |||||
| | * | Convert NativeWifi engine into a plugin. | Aaron McCarthy | 2009-12-22 | 10 | -364/+517 |
| | | | |||||
| | * | Convert NLA engine nito a plugin. | Aaron McCarthy | 2009-12-22 | 12 | -62/+146 |
| | | | |||||
| | * | Convert NetworkManager engine into a plugin. | Aaron McCarthy | 2009-12-22 | 13 | -85/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp src/plugins/bearer/networkmanager/qnetworkmanagerservice.h src/plugins/bearer/networkmanager/qnmdbushelper.cpp src/plugins/bearer/networkmanager/qnmdbushelper.h src/plugins/bearer/networkmanager/qnmwifiengine.cpp src/plugins/bearer/networkmanager/qnmwifiengine.h | ||||
| | * | Convert generic engine into a plugin. | Aaron McCarthy | 2009-12-22 | 15 | -39/+298 |
| | | | |||||
| | * | Fix compile warnings. | Aaron McCarthy | 2009-12-22 | 2 | -5/+6 |
| | | | |||||
| | * | Fix up license headers. | Aaron McCarthy | 2009-12-22 | 38 | -38/+38 |
| | | | |||||
| | * | Make compile. | Aaron McCarthy | 2009-12-22 | 40 | -98/+217 |
| | | | |||||
* | | | Bearer Management Integration 3. | Aaron McCarthy | 2010-01-05 | 2 | -16/+2 |
|/ / | |||||
* | | Bearer Management Integration 2. | Aaron McCarthy | 2010-01-04 | 28 | -637/+524 |
|/ | |||||
* | Bearer Management Integration 1. | Aaron McCarthy | 2009-12-22 | 40 | -0/+14008 |
| | |||||
* | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-27 | 2 | -32/+63 |
|\ | |||||
| * | Improved and optimized the WaveUnderline | Thorbjørn Lindeijer | 2009-11-26 | 2 | -32/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WaveUnderline used to be a series of 180 degree arcs, that didn't always align very well between different text items and that could be clipped at the bottom since the font height got reduced. Now it uses quad beziers so that it is more like a sinus curve, and the alignment and clipping issues have been fixed. The painting of the WaveUnderline has been optimized using QPixmapCache. A 100 pixels wide sample of the wave is now cached as a pixmap and repeated to draw the WaveUnderline. This is an order of magnitude faster than rasterizing a QPainterPath. The QPlainTextEdit needs to set the brush origin since it draws the text items in local widget coordinates, rather than relying on a painter translation like the QTextEdit. Done with mae. | ||||
* | | Merge commit oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-27 | 32 | -610/+461 |
|\ \ | |||||
| * | | Fixed memory leak in QImagePixmapCleanupHooks. | Kim Motoyoshi Kalland | 2009-11-27 | 2 | -23/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | The QImagePixmapCleanupHooks instance was never deleted. Fixed by making it a Q_GLOBAL_STATIC. Task-number: QTBUG-6116 Reviewed-by: Trond | ||||
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Eskil Abrahamsen Blomfeldt | 2009-11-27 | 1 | -12/+0 |
| |\ \ |