summaryrefslogtreecommitdiffstats
path: root/src/network/bearer/qnetworkconfiguration.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove leading whitespace from Qt header macros.Thiago Macieira2010-03-311-7/+7
| | | | | | | 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-301-6/+24
| | | | Merging bearer header.
* Add QT_MODULE headers.Aaron McCarthy2010-02-151-0/+2
|
* Update copyright year to 2010.Aaron McCarthy2010-02-111-1/+1
|
* Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-051-6/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix up license headers.Aaron McCarthy2009-12-221-1/+1
| |
| * Make compile.Aaron McCarthy2009-12-221-5/+4
| |
* | Bearer Management Integration 2.Aaron McCarthy2010-01-041-0/+1
|/
* Bearer Management Integration 1.Aaron McCarthy2009-12-221-0/+113