summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
Commit message (Collapse)AuthorAgeFilesLines
* Commented out include that was needed only by commented out codeMiikka Heikkinen2009-05-261-7/+12
| | | | and causing build problems for symbian.
* 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
|\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * Adpot more code to use QtNetworkSettings instead of hard coded names.Frans Englich2009-05-191-0/+9
| | | | | | | | Reviewed-By: Peter Hartmann
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be read from a file at runtime. This should make auto testing more flexibile. Currently this is supported for Symbian platform. The file is named "iap.txt" and should be placed under "C:\data". When creating file use UNIX line ending and UTF 16 LE encoding. Conflicts: tests/auto/network-settings.h
* | Fixed copy/paste error in QtNetworkSettings::expectedReplyFtp.Janne Anttila2009-04-281-3/+1
|/
* Long live Qt for S60!axis2009-04-241-0/+192