Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf
	tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp

Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/auto/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h
index 559d78c148..0c0e799d8e 100644
--- a/tests/auto/shared/testhttpserver.h
+++ b/tests/auto/shared/testhttpserver.h
@@ -45,7 +45,10 @@ class TestHTTPServer : public QObject
 public:
     TestHTTPServer();
 
-    bool listen(quint16 port);
+    bool listen();
+    QUrl baseUrl() const;
+    QUrl url(const QString &documentPath) const;
+    QString urlString(const QString &documentPath) const;
     QString errorString() const;
 
     enum Mode { Normal, Delay, Disconnect };
@@ -57,6 +60,8 @@ public:
     void addAlias(const QString &filename, const QString &aliasName);
     void addRedirect(const QString &filename, const QString &redirectName);
 
+    void registerFileNameForContentSubstitution(const QString &fileName);
+
     // In Delay mode, each item needs one call to this function to be sent
     void sendDelayedItem();
 
@@ -79,6 +84,7 @@ private:
     QList<QPair<QString, Mode> > dirs;
     QHash<QTcpSocket *, QByteArray> dataCache;
     QList<QPair<QTcpSocket *, QByteArray> > toSend;
+    QSet<QString> contentSubstitutedFileNames;
 
     struct WaitData {
         QList <QByteArray>headers;