aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-05-23 12:28:46 +0200
committerUlf Hermann <ulf.hermann@qt.io>2018-05-23 14:08:47 +0000
commitcda2680d801acce4e221b23e88d9b3c5504f86e8 (patch)
tree64ec6d80568603fe694623ed494b1718414bfac2 /tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
parent160e6ee28f64665812730a94f8390521ef7ad6f8 (diff)
On network redirects, update finalUrl, not url
We want all further imports to be relative to the redirected URL, not the base one. Note that this will incorporate any prior URL interceptions into the final URL if a redirect happens. We don't really want this to happen because the result of interception is not meant to be the base for further URL lookup. However, as interception occurs before redirection, this is unavoidable. Don't use URL interceptors on remote URLs. Task-number: QTBUG-67882 Change-Id: I2717bdd4de119ac67caa08fdccc041432025abff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro')
-rw-r--r--tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
index 3a20e94741..0352561e03 100644
--- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
+++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.pro
@@ -3,7 +3,12 @@ TARGET = tst_qqmltypeloader
QT += qml testlib qml-private quick
macx:CONFIG -= app_bundle
-SOURCES += tst_qqmltypeloader.cpp
+SOURCES += \
+ tst_qqmltypeloader.cpp \
+ ../../shared/testhttpserver.cpp
+
+HEADERS += \
+ ../../shared/testhttpserver.h
include (../../shared/util.pri)