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

Change-Id: I09ecc95475806ef15e3e57321a20f727dc86314d

8 files changed, 40 insertions, 15 deletions

diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp
index 0b837052f..eceec1bbd 100644
--- a/src/core/aspects/aspectcommanddebugger.cpp
+++ b/src/core/aspects/aspectcommanddebugger.cpp
@@ -37,8 +37,6 @@
 **
 ****************************************************************************/
 
-#ifdef QT3D_JOBS_RUN_STATS
-
 #include "aspectcommanddebugger_p.h"
 
 #include <Qt3DCore/qaspectengine.h>
@@ -218,5 +216,3 @@ void AspectCommandDebugger::executeCommand(const QString &command,
 } // Qt3DCore
 
 QT_END_NAMESPACE
-
-#endif
diff --git a/src/core/aspects/aspectcommanddebugger_p.h b/src/core/aspects/aspectcommanddebugger_p.h
index b173a5c09..bb6100df5 100644
--- a/src/core/aspects/aspectcommanddebugger_p.h
+++ b/src/core/aspects/aspectcommanddebugger_p.h
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#ifdef QT3D_JOBS_RUN_STATS
+#include <Qt3DCore/qt3dcore-config.h>
 
 #ifndef QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H
 #define QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H
@@ -108,5 +108,3 @@ private:
 QT_END_NAMESPACE
 
 #endif // QT3DCORE_DEBUG_ASPECTCOMMANDDEBUGGER_H
-
-#endif // QT3D_JOBS_RUN_STATS
diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri
index 773c736a3..54d939138 100644
--- a/src/core/aspects/aspects.pri
+++ b/src/core/aspects/aspects.pri
@@ -5,8 +5,7 @@ SOURCES += \
         $$PWD/qaspectengine.cpp \
         $$PWD/qaspectfactory.cpp \
         $$PWD/qaspectmanager.cpp \
-        $$PWD/qaspectthread.cpp \
-        $$PWD/aspectcommanddebugger.cpp
+        $$PWD/qaspectthread.cpp
 
 HEADERS += \
         $$PWD/qabstractaspect.h \
@@ -15,7 +14,13 @@ HEADERS += \
         $$PWD/qaspectengine_p.h \
         $$PWD/qaspectfactory_p.h \
         $$PWD/qaspectmanager_p.h \
-        $$PWD/qaspectthread_p.h \
-        $$PWD/aspectcommanddebugger_p.h
+        $$PWD/qaspectthread_p.h
 
 INCLUDEPATH += $$PWD
+
+include($$OUT_PWD/../core/qt3dcore-config.pri)
+QT_FOR_CONFIG += 3dcore-private
+qtConfig(qt3d-profile-jobs): {
+    HEADERS += $$PWD/aspectcommanddebugger_p.h
+    SOURCES += $$PWD/aspectcommanddebugger.cpp
+}
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index deb6245fd..a3fda90b0 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -49,7 +49,6 @@
 #include <Qt3DCore/private/corelogging_p.h>
 #include <Qt3DCore/private/qaspectthread_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
-#include <Qt3DCore/private/aspectcommanddebugger_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/private/qeventfilterservice_p.h>
 #include <Qt3DCore/private/qnode_p.h>
@@ -58,6 +57,11 @@
 #include <Qt3DCore/private/qpostman_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
+#include <Qt3DCore/qt3dcore-config.h>
+
+#if defined(QT3D_JOBS_RUN_STATS)
+#include <Qt3DCore/private/aspectcommanddebugger_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h
index c2211dce1..a7311d054 100644
--- a/src/core/aspects/qaspectengine_p.h
+++ b/src/core/aspects/qaspectengine_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <Qt3DCore/qt3dcore-config.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <QtCore/qsharedpointer.h>
 
diff --git a/src/core/configure.json b/src/core/configure.json
index 028f4e0bc..86b31223f 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -4,7 +4,9 @@
 
     "commandline": {
         "options": {
-            "assimp": { "type": "enum", "values": [ "qt", "system" ] }
+            "assimp": { "type": "enum", "values": [ "qt", "system" ] },
+            "qt3d-profile-jobs": "boolean",
+            "qt3d-profile-gl": "boolean"
         }
     },
 
@@ -30,6 +32,22 @@
             "disable": "input.assimp == 'qt'",
             "condition": "features.assimp && libs.assimp",
             "output": [ "privateFeature" ]
+        },
+        "qt3d-profile-jobs": {
+            "label": "Output Qt3D Job traces",
+            "autoDetect": false,
+            "output": [
+                "privateFeature",
+                { "type": "define", "name": "QT3D_JOBS_RUN_STATS", "value": 1 }
+            ]
+        },
+        "qt3d-profile-gl": {
+            "label": "Output Qt3D GL traces",
+            "autoDetect": false,
+            "output": [
+                "privateFeature",
+                { "type": "define", "name": "QT3D_OPENGL_RUN_STATS", "value": 1 }
+            ]
         }
     },
 
@@ -41,7 +59,9 @@
             "section": "Qt 3D",
             "entries": [
                 "assimp",
-                "system-assimp"
+                "system-assimp",
+                "qt3d-profile-jobs",
+                "qt3d-profile-gl"
             ]
         }
     ]
diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h
index fdf39b8b6..6786ccef7 100644
--- a/src/core/jobs/qaspectjob_p.h
+++ b/src/core/jobs/qaspectjob_p.h
@@ -54,6 +54,7 @@
 #include <QtCore/QWeakPointer>
 
 #include <Qt3DCore/private/qt3dcore_global_p.h>
+#include <Qt3DCore/qt3dcore-config.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 6caf03337..42c8887ce 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -204,7 +204,7 @@ void QNodePrivate::_q_addChild(QNode *childNode)
     // removed from the scene as part of the destruction of the parent, when the
     // parent's children are deleted in the QObject dtor, we still have access to
     // the parentId. If we didn't store this, we wouldn't have access at that time
-    // because the parent woudl then only be a QObject, the QNode part would have
+    // because the parent would then only be a QObject, the QNode part would have
     // been destroyed already.
     QNodePrivate::get(childNode)->m_parentId = m_id;