diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-10-10 10:16:32 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-14 18:55:00 +0000 |
| commit | 7758f05f986c514998d7814fa8241b537a3dcab4 (patch) | |
| tree | 43fd2bcecbaf66946486795fe062dea2b3d60fe9 /src | |
| parent | be976ee15f819e0a63a3e999fcff0802887703bf (diff) | |
Make QAspectThread private
Change-Id: I1ca23ed346544e50a51ea6d2430b1e6f36a789a7
Task-number: QTBUG-48385
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/aspects/aspects.pri | 7 | ||||
| -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) | 17 |
4 files changed, 19 insertions, 10 deletions
diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri index af38390d2..b2e1a2130 100644 --- a/src/core/aspects/aspects.pri +++ b/src/core/aspects/aspects.pri @@ -11,9 +11,8 @@ HEADERS += \ $$PWD/qaspectengine.h \ $$PWD/qaspectfactory.h \ $$PWD/qaspectfactory_p.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 6a0836294..ab85d2701 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 67ce4cf20..169d433d6 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 7bb48771e..c0054f970 100644 --- a/src/core/aspects/qaspectthread.h +++ b/src/core/aspects/qaspectthread_p.h @@ -34,8 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3DCORE_QASPECTTHREAD_H -#define QT3DCORE_QASPECTTHREAD_H +#ifndef QT3DCORE_QASPECTTHREAD_P_H +#define QT3DCORE_QASPECTTHREAD_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// #include <QThread> #include <Qt3DCore/qt3dcore_global.h> @@ -70,4 +81,4 @@ private: QT_END_NAMESPACE -#endif // QT3DCORE_QASPECTTHREAD_H +#endif // QT3DCORE_QASPECTTHREAD_P_H |