summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'BearerIntegration-4' into bearermanagement/integration-4Aaron McCarthy2010-01-294-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 McCarthy2010-01-295-15/+15
| |
* | Return default configuration from engines.Aaron McCarthy2010-01-264-26/+17
| |
* | Connect up preferredConfigurationChanged() signal.Aaron McCarthy2010-01-261-0/+2
| |
* | Merge branch 'ares/mac/bearermanagement/integration' into ↵Aaron McCarthy2010-01-263-2/+14
|\ \ | | | | | | | | | bearermanagement/integration
| * | Make compile on Mac OS X.Aaron McCarthy2010-01-203-2/+14
| | |
| * | Make compile on Unix.Aaron McCarthy2010-01-184-2/+22
| | |
* | | Make compile on Windows.Aaron McCarthy2010-01-186-4/+28
| | |
* | | Make compile on Unix.Aaron McCarthy2010-01-185-4/+26
|/ /
* | Port session functionality.Aaron McCarthy2010-01-1818-420/+497
| |
* | Partially convert Symbian backend into a plugin.Aaron McCarthy2010-01-1227-598/+460
| | | | | | | | QNetworkSession functionality not converted yet.
* | Return empty bearer name for invalid, ServiceNetwork and UserChoice.Aaron McCarthy2010-01-111-1/+1
| |
* | Make compile for Symbian.Aaron McCarthy2010-01-075-9/+47
| |
* | Fix build on Maemo, force type to qreal.Aaron McCarthy2010-01-071-1/+2
| |
* | Fix test compile failure when using frameworks on Mac OS X.Aaron McCarthy2010-01-061-1/+1
| |
* | Fix failures on Mac OS X after merge.Aaron McCarthy2010-01-061-0/+3
| |
* | Merge commit '554e022396eff5bd7b93e070cf9bbb3257945f0b' into ↵Aaron McCarthy2010-01-0560-2880/+3234
|\ \ | |/ |/| | | bearermanagement/integration-3
| * Fix failure on Windows after merge.Aaron McCarthy2010-01-051-2/+3
| |
| * Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-0560-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 McCarthy2010-01-042-105/+2
| | |
| | * Convert Core Wlan plugin to be incremental.Aaron McCarthy2010-01-043-41/+220
| | |
| | * Emit updateCompleted() when requestUpdate() is called.Aaron McCarthy2010-01-042-0/+10
| | |
| | * Fix memory leak in NLA engine.Aaron McCarthy2010-01-041-9/+1
| | |
| | * Remove bearer.pro.Aaron McCarthy2010-01-041-163/+0
| | |
| | * Remove unused BEARER_ENGINE preprocessor define.Aaron McCarthy2010-01-049-33/+5
| | |
| | * Convert Native Wifi plugin to be incremental.Aaron McCarthy2010-01-043-30/+106
| | |
| | * Convert NLA plugin to be incremental.Aaron McCarthy2010-01-043-24/+95
| | |
| | * Remove unused global statics.Aaron McCarthy2010-01-047-32/+0
| | |
| | * Rework NetworkManager backend.Aaron McCarthy2010-01-0417-1359/+863
| | |
| | * Keep track of which QNetworkInterface is for each QNetworkConfiguration.Aaron McCarthy2010-01-042-3/+5
| | |
| | * Convert generic engine plugin to be incremental.Aaron McCarthy2010-01-0410-390/+266
| | |
| | * Remove debug.Aaron McCarthy2010-01-046-21/+0
| | |
| | * Convert CoreWlan engine into a plugin.Aaron McCarthy2010-01-049-58/+129
| | |
| | * Update license headers.Aaron McCarthy2009-12-223-3/+3
| | |
| | * Fix license headers.Aaron McCarthy2009-12-221-1/+1
| | |
| | * Convert NativeWifi engine into a plugin.Aaron McCarthy2009-12-2210-364/+517
| | |
| | * Convert NLA engine nito a plugin.Aaron McCarthy2009-12-2212-62/+146
| | |
| | * Convert NetworkManager engine into a plugin.Aaron McCarthy2009-12-2213-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 McCarthy2009-12-2215-39/+298
| | |
| | * Fix compile warnings.Aaron McCarthy2009-12-222-5/+6
| | |
| | * Fix up license headers.Aaron McCarthy2009-12-2238-38/+38
| | |
| | * Make compile.Aaron McCarthy2009-12-2240-98/+217
| | |
* | | Bearer Management Integration 3.Aaron McCarthy2010-01-052-16/+2
|/ /
* | Bearer Management Integration 2.Aaron McCarthy2010-01-0428-637/+524
|/
* Bearer Management Integration 1.Aaron McCarthy2009-12-2240-0/+14008
|
* Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-272-32/+63
|\
| * Improved and optimized the WaveUnderlineThorbjørn Lindeijer2009-11-262-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.6Olivier Goffart2009-11-2732-610/+461
|\ \
| * | Fixed memory leak in QImagePixmapCleanupHooks.Kim Motoyoshi Kalland2009-11-272-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.6Eskil Abrahamsen Blomfeldt2009-11-271-12/+0
| |\ \