summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-101-16/+63
| | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Disabled QtNetworkSettingsInitializerCode code for Symbian HW.Janne Anttila2009-10-021-8/+16
| | | | | | | | | | | | | | | | | | | | This code is just causing more problems, than helping us to solve autotest problems. So initial purpose of this code is against us, why: qWarning used in this code sto print debug info is not visible in HW since global static objects are initialized before the QTestLib initializes the output channel. Running hostname resolving in globab static object constructir is not very trivial, requiring IAP setup and all network related code to be executed. Since application environment is no yet completely running at the time when gloabl static are costructed, the operation is deemed to fail. Failing means calling qFatal whcih in essence is causing panic in very early phase of test execution. This happens also for some QtCore autotests which have minor dependency to QtNetwork. making the autotest result to look worse than they actually are. Reviewed-by: Aleksandar Sasha Babic
* Added #ifdef Q_OS_SYMBIAN quard for ealier commit d78717e7Janne Anttila2009-09-091-2/+12
|
* Fix for E32User-Cbase 69 panic, when runnign QtNetwork autotestsJanne Anttila2009-09-091-7/+16
| | | | Reviewed-by: Janne Koskinen
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* network-settings.h: Check for DNS setup only when neededMarkus Goetz2009-09-081-1/+2
|
* Revert "network-settings.h: Compile fix relating to some tests"Markus Goetz2009-09-081-0/+2
| | | | This reverts commit 69e5a3fce4d355822367dc1a17179a364111632e.
* network-settings.h: Compile fix relating to some testsMarkus Goetz2009-09-081-2/+0
| | | | Reviewed-by: TrustMe
* Tests: Do not execute network tests at all if DNS setup is broken.Markus Goetz2009-09-081-0/+15
| | | | Reviewed-by: Jesper
* Network tests: Fix typo in network-settings.h to make it compileMarkus Goetz2009-09-071-1/+1
|
* Minor fix to network-settings.h in Symbian OSJanne Anttila2009-09-071-5/+4
| | | | Reviewed-by: Aleksandar Sasha Babic
* Update license headersJason McDonald2009-09-041-0/+3
| | | | Reviewed-by: Trust Me
* QSslSocket autotest: fix failing testsPeter Hartmann2009-09-021-1/+1
| | | | | | no issues in code, just in server and test setup Reviewed-by: trustme
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | 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
| | | | | | | | | | | | different server machines. On Symbian we read replies from external file, for others we put data into network-settings.h
* | Trivial, obsolete lines.Aleksandar Sasha Babic2009-08-131-4/+0
| |
* | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Switched QtNetworkSetting to use 'qt-test-server' config by default.Janne Anttila2009-08-111-5/+6
| | | | | | | | | | | | | | | | Qt/Master uses qt-test-server config by default but our S60/master was configure to use different server by default. The assumption is that this caused several QtNetwork autotests to fail when testing QtS60 branch on other configurations in QtSW premises. This because the old test server was very likely unavailable...
* | Unified QtNetworkSettings:severIP return type for all platforms.Janne Anttila2009-08-111-16/+9
| | | | | | | | | | | | | | | | | | This commit fixes the following autotest case build breaks on windows when compiling QtS60 sources: - q3socket - q3socketdevice - qhostinfo - qsocks5socketengine
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Fix Qt network autotest compilation for ARMV5.Janne Anttila2009-06-161-2/+4
| | | | | | | | | | | | The build was broken by commit: 7604f8087f88171ef933d8ae08f501467e647338
* | Make Qt exception safer.Robert Griebl2009-06-101-20/+22
| | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | 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
generated by cgit v0.12 at 2024-11-10 04:44:42 (GMT)