summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Fixed network-settings.h build for symbianMiikka Heikkinen2009-08-141-5/+5
* | Replies are different for platforms as we targetAleksandar Sasha Babic2009-08-141-8/+4
* | Trivial, obsolete lines.Aleksandar Sasha Babic2009-08-131-4/+0
* | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| |/
* | Switched QtNetworkSetting to use 'qt-test-server' config by default.Janne Anttila2009-08-111-5/+6
* | Unified QtNetworkSettings:severIP return type for all platforms.Janne Anttila2009-08-111-16/+9
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | Fix Qt network autotest compilation for ARMV5.Janne Anttila2009-06-161-2/+4
* | Make Qt exception safer.Robert Griebl2009-06-101-20/+22
* | Commented out include that was needed only by commented out codeMiikka Heikkinen2009-05-261-7/+12
* | Resolving some merge issues.Aleksandar Sasha Babic2009-05-211-2/+2
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-201-0/+8
|\ \ | |/
| * Adpot more code to use QtNetworkSettings instead of hard coded names.Frans Englich2009-05-191-0/+9
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+66
* Some of the epxected replies for network tests can now be loaded via file.Aleksandar Sasha Babic2009-05-081-15/+35
* Simple refactoring how the data are fetched and stored.Aleksandar Sasha Babic2009-04-281-25/+29
* Fixed unresolved merge conflict in network-settings.hJanne Anttila2009-04-281-3/+0
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-281-13/+127
|\
| * Network server test related data (serever name, IP address ...) can nowAleksandar Sasha Babic2009-04-271-13/+127
* | Fixed copy/paste error in QtNetworkSettings::expectedReplyFtp.Janne Anttila2009-04-281-3/+1
|/
* Long live Qt for S60!axis2009-04-241-0/+192