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

Conflicts:
	src/qml/qml/qqmlimport.cpp

Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a

13 files changed, 47 insertions, 13 deletions

diff --git a/src/particles/particles.pri b/src/particles/particles.pri
index af71634ec6..576d826903 100644
--- a/src/particles/particles.pri
+++ b/src/particles/particles.pri
@@ -1,6 +1,5 @@
 HEADERS += \
     $$PWD/qquickangledirection_p.h \
-    $$PWD/qquickcustomparticle_p.h \
     $$PWD/qquickcustomaffector_p.h \
     $$PWD/qquickellipseextruder_p.h \
     $$PWD/qquicktrailemitter_p.h \
@@ -33,7 +32,6 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qquickangledirection.cpp \
-    $$PWD/qquickcustomparticle.cpp \
     $$PWD/qquickcustomaffector.cpp \
     $$PWD/qquickellipseextruder.cpp \
     $$PWD/qquicktrailemitter.cpp \
@@ -63,6 +61,14 @@ SOURCES += \
     $$PWD/qquickparticlegroup.cpp \
     $$PWD/qquickgroupgoal.cpp
 
+qtConfig(quick-shadereffect) {
+HEADERS += \
+    $$PWD/qquickcustomparticle_p.h
+
+SOURCES += \
+    $$PWD/qquickcustomparticle.cpp
+}
+
 OTHER_FILES += \
     $$PWD/shaders/customparticletemplate.vert \
     $$PWD/shaders/customparticle.vert \
diff --git a/src/particles/qquickparticlesmodule.cpp b/src/particles/qquickparticlesmodule.cpp
index accdb668de..03f47a3961 100644
--- a/src/particles/qquickparticlesmodule.cpp
+++ b/src/particles/qquickparticlesmodule.cpp
@@ -37,8 +37,12 @@
 **
 ****************************************************************************/
 
+#include <private/qtquickglobal_p.h>
+
 #include "qquickangledirection_p.h"
+#if QT_CONFIG(quick_shadereffect)
 #include "qquickcustomparticle_p.h"
+#endif
 #include "qquickellipseextruder_p.h"
 #include "qquicktrailemitter_p.h"
 #include "qquickfriction_p.h"
@@ -84,7 +88,9 @@ void QQuickParticlesModule::defineModule()
     qmlRegisterType<QQuickParticleGroup>(uri, 2, 0, "ParticleGroup");
 
     qmlRegisterType<QQuickImageParticle>(uri, 2, 0, "ImageParticle");
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickCustomParticle>(uri, 2, 0, "CustomParticle");
+#endif
     qmlRegisterType<QQuickItemParticle>(uri, 2, 0, "ItemParticle");
 
     qmlRegisterType<QQuickParticleEmitter>(uri, 2, 0, "Emitter");
diff --git a/src/qml/configure.json b/src/qml/configure.json
index d22ba3b8f0..2c4887365f 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -22,6 +22,19 @@
             "label": "QML network support",
             "purpose": "Provides network transparency for QML",
             "output": [ "publicFeature" ]
+        },
+        "qml-profiler": {
+            "label": "Command line QML Profiler",
+            "purpose": "The QML Profiler retrieves QML tracing data from an application.",
+            "condition": [
+                "features.commandlineparser",
+                "features.localserver",
+                "features.process",
+                "features.qml-debug",
+                "features.qml-network",
+                "features.xmlstreamwriter"
+            ],
+            "output": [ "privateFeature" ]
         }
     },
 
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 86ad84b9c1..a762564912 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -791,7 +791,7 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in
     // marshalled back onto the QObject's thread and handled by QML from there.  This is tested
     // by the qqmlecmascript::threadSignal() autotest.
     if (ddata->notifyList &&
-        QThread::currentThreadId() != QObjectPrivate::get(object)->threadData->threadId) {
+        QThread::currentThreadId() != QObjectPrivate::get(object)->threadData->threadId.load()) {
 
         if (!QObjectPrivate::get(object)->threadData->thread)
             return;
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp
index 185f9687fb..538ca822ee 100644
--- a/src/qml/qml/qqmlnotifier.cpp
+++ b/src/qml/qml/qqmlnotifier.cpp
@@ -122,8 +122,8 @@ void QQmlNotifierEndpoint::connect(QObject *source, int sourceSignal, QQmlEngine
     disconnect();
 
     Q_ASSERT(engine);
-    if (QObjectPrivate::get(source)->threadData->threadId !=
-        QObjectPrivate::get(engine)->threadData->threadId) {
+    if (QObjectPrivate::get(source)->threadData->threadId.load() !=
+        QObjectPrivate::get(engine)->threadData->threadId.load()) {
 
         QString sourceName;
         QDebug(&sourceName) << source;
diff --git a/src/quick/configure.json b/src/quick/configure.json
index 4ed11e8318..e06cae8641 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -51,6 +51,7 @@
         "quick-canvas": {
             "label": "Canvas item",
             "purpose": "Provides the Qt Quick Canvas Item",
+            "condition": "features.quick-path",
             "output": [
                 "privateFeature"
             ]
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index a81ab619ac..da9379e7af 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -47,6 +47,7 @@
 #include <qsgtextureprovider.h>
 #include <QtQuick/private/qquickpixmapcache_p.h>
 #include <QtGui/QGuiApplication>
+#include <qsgtextureprovider.h>
 
 #include <qqmlinfo.h>
 #include <private/qqmlengine_p.h>
diff --git a/src/quick/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h
index 229fbf1007..3e160ed55a 100644
--- a/src/quick/items/qquickpainteditem_p.h
+++ b/src/quick/items/qquickpainteditem_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include "qquickpainteditem.h"
 #include "qquickitem_p.h"
 #include "qquickpainteditem.h"
 #include <QtGui/qcolor.h>
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 7d182b7255..b347b603bb 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -70,14 +70,17 @@ qtHaveModule(widgets) {
         qjsvalue
 }
 
-SUBDIRS += $$PUBLICTESTS \
-    qqmlextensionplugin
+SUBDIRS += $$PUBLICTESTS
 SUBDIRS += $$METATYPETESTS
 qtConfig(process) {
     !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
     SUBDIRS += qmllint qmlplugindump
 }
 
+qtConfig(library) {
+    SUBDIRS += qqmlextensionplugin
+}
+
 qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
 
diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
index 3ed0aa7446..90868d2ead 100644
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
@@ -29,7 +29,9 @@
 #include <qtest.h>
 #include <QLibraryInfo>
 #include <QDir>
+#if QT_CONFIG(process)
 #include <QProcess>
+#endif
 #include <QDebug>
 #include <QQmlError>
 #include <cstdlib>
@@ -42,7 +44,7 @@ public:
 
 private slots:
     void initTestCase();
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
     void qmlMinify_data();
     void qmlMinify();
 #endif
@@ -166,7 +168,7 @@ Examples are any .qml files under the examples/ directory that start
 with a lower case letter.
 */
 
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
 void tst_qmlmin::qmlMinify_data()
 {
     QTest::addColumn<QString>("file");
@@ -183,7 +185,7 @@ void tst_qmlmin::qmlMinify_data()
 }
 #endif
 
-#if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
+#if QT_CONFIG(process) && !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
 void tst_qmlmin::qmlMinify()
 {
     QFETCH(QString, file);
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
index 74add85cb0..f7748b2da9 100644
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -29,7 +29,9 @@
 #include "../../shared/util.h"
 #include <QQmlApplicationEngine>
 #include <QSignalSpy>
+#if QT_CONFIG(process)
 #include <QProcess>
+#endif
 #include <QDebug>
 
 class tst_qqmlapplicationengine : public QQmlDataTest
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index d5c9aaeb90..b6742b9efe 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -29,7 +29,6 @@
 #include <qtest.h>
 #include <QLibraryInfo>
 #include <QDir>
-#include <QProcess>
 #include <QDebug>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
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
             }