Merge remote-tracking branch 'origin/5.9' into HEAD

Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
	src/qml/jit/qv4assembler.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm.cpp
	src/qml/jsruntime/qv4context.cpp
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/memory/qv4mmdefs_p.h

Change-Id: I9966750b7cd9106b78e4c4779f12b95a481cca40

6 files changed, 8 insertions, 6 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 1699d3d81b..53dd35da07 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -567,7 +567,7 @@ int main(int argc, char *argv[])
         loadDummyDataFiles(e, dummyDir);
 
     for (const QString &path : qAsConst(files)) {
-        QUrl url = QUrl::fromUserInput(path, QDir::currentPath());
+        QUrl url = QUrl::fromUserInput(path, QDir::currentPath(), QUrl::AssumeLocalFile);
         if (verboseMode)
             printf("qml: loading %s\n", qPrintable(url.toString()));
         QByteArray strippedFile;
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 9a68e2ac97..657b1e8501 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -32,13 +32,13 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QDateTime>
+#include <QHashFunctions>
 
 #include <private/qqmlirbuilder_p.h>
 #include <private/qv4isel_moth_p.h>
 #include <private/qqmljsparser_p.h>
 
 QT_BEGIN_NAMESPACE
-extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
 
 namespace QV4 { namespace JIT {
 Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture);
@@ -291,7 +291,7 @@ static bool compileJSFile(const QString &inputFileName, const QString &outputFil
 int main(int argc, char **argv)
 {
     // Produce reliably the same output for the same input by disabling QHash's random seeding.
-    qt_qhash_seed.testAndSetRelaxed(-1, 0);
+    qSetGlobalQHashSeed(0);
 
     QCoreApplication app(argc, argv);
     QCoreApplication::setApplicationName(QStringLiteral("qmlcachegen"));
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index 081e0660d5..182547490d 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
                 if (cache && QFile::exists(fn + QLatin1Char('c'))) {
                     QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit = iSelFactory->createUnitForLoading();
                     QString error;
-                    if (unit->loadFromDisk(QUrl::fromLocalFile(fn), iSelFactory, &error)) {
+                    if (unit->loadFromDisk(QUrl::fromLocalFile(fn), QFileInfo(fn).lastModified(), iSelFactory, &error)) {
                         script.reset(new QV4::Script(&vm, nullptr, unit));
                     } else {
                         std::cout << "Error loading" << qPrintable(fn) << "from disk cache:" << qPrintable(error) << std::endl;
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index 668cb3ce2d..596ad8d47f 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -33,6 +33,7 @@
 #include <QHash>
 #include <QFile>
 #include <QXmlStreamReader>
+#include <QRegExp>
 
 #include <limits>
 
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 1e8d91a95b..7741c4c45b 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -33,6 +33,7 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qtextstream.h>
+#include <QtCore/qregexp.h>
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QOpenGLFunctions>
diff --git a/tools/tools.pro b/tools/tools.pro
index bf39a649df..5d9d3740ce 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -10,7 +10,7 @@ SUBDIRS += \
         qml \
         qmllint
 
-    qtConfig(qml-network):!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmlprofiler
+    qtConfig(qml-profiler): SUBDIRS += qmlprofiler
 
     qtHaveModule(quick) {
         !static: {
@@ -18,7 +18,7 @@ SUBDIRS += \
                 qmlscene \
                 qmltime
 
-            qtConfig(regularexpression) {
+            qtConfig(regularexpression):qtConfig(process) {
                 SUBDIRS += \
                     qmlplugindump
             }