diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-10-10 10:16:32 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:57:36 +0000 |
| commit | ec963e106397d46e5c853e9adb3fbec1b27d9b04 (patch) | |
| tree | b3f4900d72384012188b00dc59fc8d8ff881631b | |
| parent | e83609365b527abc565214763caace14653ef5d1 (diff) | |
Make QAspectThread private5.5
Change-Id: I1ca23ed346544e50a51ea6d2430b1e6f36a789a7
Task-number: QTBUG-48385
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/core/aspects/aspects.pri | 4 | ||||
| -rw-r--r-- | src/core/aspects/qaspectengine.cpp | 2 | ||||
| -rw-r--r-- | src/core/aspects/qaspectthread.cpp | 3 | ||||
| -rw-r--r-- | src/core/aspects/qaspectthread_p.h (renamed from src/core/aspects/qaspectthread.h) | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri index 8153920e6..14d2f73f3 100644 --- a/src/core/aspects/aspects.pri +++ b/src/core/aspects/aspects.pri @@ -10,9 +10,9 @@ HEADERS += \ $$PWD/qabstractaspect.h \ $$PWD/qaspectengine.h \ $$PWD/qaspectfactory.h \ - $$PWD/qaspectthread.h \ $$PWD/qabstractaspect_p.h \ $$PWD/qaspectengine_p.h \ - $$PWD/qaspectmanager_p.h + $$PWD/qaspectmanager_p.h \ + $$PWD/qaspectthread_p.h INCLUDEPATH += $$PWD diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 9871f558d..7cccb9643 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -37,7 +37,7 @@ #include "qaspectengine.h" #include "qabstractaspect.h" -#include "qaspectthread.h" +#include "qaspectthread_p.h" #include "qaspectmanager_p.h" #include "qchangearbiter_p.h" #include "qabstractaspect.h" diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp index 0b1a969d3..2a0e19e6f 100644 --- a/src/core/aspects/qaspectthread.cpp +++ b/src/core/aspects/qaspectthread.cpp @@ -34,8 +34,7 @@ ** ****************************************************************************/ -#include "qaspectthread.h" - +#include "qaspectthread_p.h" #include "qaspectmanager_p.h" #include <Qt3DCore/private/corelogging_p.h> diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread_p.h index 8d32e28bd..4437f4838 100644 --- a/src/core/aspects/qaspectthread.h +++ b/src/core/aspects/qaspectthread_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTTHREAD_H -#define QT3D_QASPECTTHREAD_H +#ifndef QT3D_QASPECTTHREAD_P_H +#define QT3D_QASPECTTHREAD_P_H #include <QThread> #include <Qt3DCore/qt3dcore_global.h> @@ -70,4 +70,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QASPECTTHREAD_H +#endif // QT3D_QASPECTTHREAD_P_H |