diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/core/aspects/aspectcommanddebugger.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/core/aspects/aspectcommanddebugger.cpp')
| -rw-r--r-- | src/core/aspects/aspectcommanddebugger.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp index 6bb93c827..eceec1bbd 100644 --- a/src/core/aspects/aspectcommanddebugger.cpp +++ b/src/core/aspects/aspectcommanddebugger.cpp @@ -37,14 +37,14 @@ ** ****************************************************************************/ -#ifdef QT3D_JOBS_RUN_STATS - #include "aspectcommanddebugger_p.h" + #include <Qt3DCore/qaspectengine.h> +#include <QtNetwork/QTcpSocket> +#include <QtCore/QJsonDocument> +#include <QtCore/QJsonObject> + #include <Qt3DCore/private/qabstractaspect_p.h> -#include <QTcpSocket> -#include <QJsonDocument> -#include <QJsonObject> QT_BEGIN_NAMESPACE @@ -216,5 +216,3 @@ void AspectCommandDebugger::executeCommand(const QString &command, } // Qt3DCore QT_END_NAMESPACE - -#endif |