summaryrefslogtreecommitdiffstats
path: root/tests/auto/qhostinfo
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-111-4/+1
|\
| * Merge commit 'qt/master-stable'Jason Barron2009-08-101-4/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| | * tst_QHostInfo: Disable short name tests for lookupIPv4.Jocelyn Turcotte2009-08-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | These tests run against domain names in troll.no and to allow shorter names the machine has to be in this domain. Removing them since this specific case test the OS more than Qt itself. Reviewed-by: Thiago
* | | Unified QtNetworkSettings:severIP return type for all platforms.Janne Anttila2009-08-111-2/+4
|/ / | | | | | | | | | | | | | | | | This commit fixes the following autotest case build breaks on windows when compiling QtS60 sources: - q3socket - q3socketdevice - qhostinfo - qsocks5socketengine
* | Trailing whitespace and tab/space fixes for auto testsJanne Anttila2009-08-041-3/+3
| |
* | 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
| * Autotest: Cisco changed their DNS setup; update our test.Thiago Macieira2009-04-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Long live Qt 4.5!Lars Knoll2009-03-233-0/+423
|
* No need for this IP address.Aleksandar Sasha Babic2009-05-281-1/+0
|
* Long live Qt for S60!axis2009-04-243-0/+433