Fixup importsRemote

2 files changed, 13 insertions, 7 deletions

diff --git a/tests/auto/declarative/qmllanguage/qmllanguage.pro b/tests/auto/declarative/qmllanguage/qmllanguage.pro
index e45d73a..d1876ef 100644
--- a/tests/auto/declarative/qmllanguage/qmllanguage.pro
+++ b/tests/auto/declarative/qmllanguage/qmllanguage.pro
@@ -1,11 +1,14 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-QT += script
+QT += script network
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qmllanguage.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
-# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
-# LIBS += -lgcov
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += ../shared/testhttpserver.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
index c23bb2d..a05ee06 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
@@ -49,7 +49,6 @@
 #include "testtypes.h"
 
 #include "../../../shared/util.h"
-#include "../../network-settings.h"
 
 /*
 This test case covers QML language issues.  This covers everything that does 
@@ -1070,19 +1069,23 @@ void tst_qmllanguage::importsRemote_data()
     QTest::addColumn<QString>("qml");
     QTest::addColumn<QString>("type");
 
-    QString serverdir = "http://"
-            + QtNetworkSettings::serverName()
-            + "/qtest/declarative/qmllanguage";
+    QString serverdir = "http://127.0.0.1:14445/qtest/declarative/qmllanguage";
 
     QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QmlGraphicsRectangle";
     QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QmlGraphicsText";
     QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QmlGraphicsImage";
 }
 
+#include "testhttpserver.h"
+
 void tst_qmllanguage::importsRemote()
 {
     QFETCH(QString, qml);
     QFETCH(QString, type);
+
+    TestHTTPServer server(14445);
+    server.serveDirectory(SRCDIR);
+
     testType(qml,type);
 }