summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-07-30 13:35:19 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-08-03 14:44:57 +0000
commit069695f2e54d3c6cd60f234a87c95c219c69a291 (patch)
tree757bf02b19627c58c7f29b84471e130ed9f159ad
parente81390a04f42b4ab95091aee5fee7a1663514aae (diff)
Make qtickclockservice header private
Change-Id: Ic240a080a7e1edf6adf437e18aca237c3a7dec7a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/core/aspects/qaspectmanager.cpp2
-rw-r--r--src/core/services/qservicelocator.cpp2
-rw-r--r--src/core/services/qtickclockservice.cpp2
-rw-r--r--src/core/services/qtickclockservice_p.h (renamed from src/core/services/qtickclockservice.h)17
-rw-r--r--src/core/services/services.pri2
5 files changed, 18 insertions, 7 deletions
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index e5c461631..a537bf235 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -44,8 +44,8 @@
#include "qentity.h"
#include <Qt3DCore/qservicelocator.h>
-#include <Qt3DCore/qtickclockservice.h>
+#include <Qt3DCore/private/qtickclockservice_p.h>
#include <Qt3DCore/private/corelogging_p.h>
#include <Qt3DCore/private/qscheduler_p.h>
#include <Qt3DCore/private/qtickclock_p.h>
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp
index 4015f123b..7fc369bd5 100644
--- a/src/core/services/qservicelocator.cpp
+++ b/src/core/services/qservicelocator.cpp
@@ -37,7 +37,7 @@
#include "qservicelocator.h"
#include "qabstractserviceprovider_p.h"
#include "nullservices_p.h"
-#include "qtickclockservice.h"
+#include "qtickclockservice_p.h"
#include <QHash>
QT_BEGIN_NAMESPACE
diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp
index 45b359cd6..85e25bd1d 100644
--- a/src/core/services/qtickclockservice.cpp
+++ b/src/core/services/qtickclockservice.cpp
@@ -34,7 +34,7 @@
**
****************************************************************************/
-#include "qtickclockservice.h"
+#include "qtickclockservice_p.h"
#include "qtickclock_p.h"
#include "qabstractframeadvanceservice_p.h"
diff --git a/src/core/services/qtickclockservice.h b/src/core/services/qtickclockservice_p.h
index a7c73c99c..a8fafdcc1 100644
--- a/src/core/services/qtickclockservice.h
+++ b/src/core/services/qtickclockservice_p.h
@@ -34,8 +34,19 @@
**
****************************************************************************/
-#ifndef QT3D_QTICKCLOCKSERVICE_H
-#define QT3D_QTICKCLOCKSERVICE_H
+#ifndef QT3D_QTICKCLOCKSERVICE_P_H
+#define QT3D_QTICKCLOCKSERVICE_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
#include "qabstractframeadvanceservice.h"
@@ -62,4 +73,4 @@ public:
QT_END_NAMESPACE
-#endif // QT3D_QTICKCLOCKSERVICE_H
+#endif // QT3D_QTICKCLOCKSERVICE_P_H
diff --git a/src/core/services/services.pri b/src/core/services/services.pri
index 370f3c2d6..964e1cbd5 100644
--- a/src/core/services/services.pri
+++ b/src/core/services/services.pri
@@ -14,7 +14,7 @@ HEADERS += \
$$PWD/qabstractserviceprovider_p.h \
$$PWD/qsysteminformationservice_p.h \
$$PWD/qopenglinformationservice_p.h \
- $$PWD/qtickclockservice.h \
+ $$PWD/qtickclockservice_p.h \
$$PWD/qabstractframeadvanceservice.h \
$$PWD/qabstractframeadvanceservice_p.h