diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-03-20 11:16:23 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-05 10:04:10 +0000 |
| commit | 0b9c8ea524a756d0839575194267c59627ea5419 (patch) | |
| tree | 9c2e36049c057dfaf7901f2bf7618dc9f71aed08 /src/core/aspects | |
| parent | 01e15dd236b23395139fed61686ea4b98da4ea7d (diff) | |
Qt3D: add configure option for jobs and GL profiling
Change-Id: Idb1f54d231e469670b24b2b2aecedbfc1cd0f956
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects')
| -rw-r--r-- | src/core/aspects/aspectcommanddebugger.cpp | 4 | ||||
| -rw-r--r-- | src/core/aspects/aspectcommanddebugger_p.h | 4 | ||||
| -rw-r--r-- | src/core/aspects/aspects.pri | 13 | ||||
| -rw-r--r-- | src/core/aspects/qaspectengine.cpp | 6 | ||||
| -rw-r--r-- | src/core/aspects/qaspectengine_p.h | 1 |
5 files changed, 16 insertions, 12 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> |