summaryrefslogtreecommitdiffstats
path: root/src/Runtime/api
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-05-27 14:32:25 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-05-27 14:59:22 +0300
commitb59b9b9e1fbd6aa1ae8edfc0d5248ab37d266e82 (patch)
treed06632337ca2b59ce174f75e5d93e0c7b86fe648 /src/Runtime/api
parentdac302ed0954471f551272bf85b08b068fceb95e (diff)
Make qml api headers privatev2.4.0-beta1
Task-number: QT3DS-3567 Change-Id: Ie093ae736b2fd9ff7d5d868196e6703f678df1b2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/api')
-rw-r--r--src/Runtime/api/studio3dqml/q3dsplugin.cpp4
-rw-r--r--src/Runtime/api/studio3dqml/q3dspresentationitem.cpp2
-rw-r--r--src/Runtime/api/studio3dqml/q3dspresentationitem_p.h (renamed from src/Runtime/api/studio3dqml/q3dspresentationitem.h)11
-rw-r--r--src/Runtime/api/studio3dqml/q3dsrenderer.cpp4
-rw-r--r--src/Runtime/api/studio3dqml/q3dsrenderer_p.h (renamed from src/Runtime/api/studio3dqml/q3dsrenderer.h)13
-rw-r--r--src/Runtime/api/studio3dqml/q3dsstudio3d.cpp6
-rw-r--r--src/Runtime/api/studio3dqml/q3dsstudio3d_p.h (renamed from src/Runtime/api/studio3dqml/q3dsstudio3d.h)11
-rw-r--r--src/Runtime/api/studio3dqml/studio3dqml.pro6
8 files changed, 45 insertions, 12 deletions
diff --git a/src/Runtime/api/studio3dqml/q3dsplugin.cpp b/src/Runtime/api/studio3dqml/q3dsplugin.cpp
index 5ae5aab2..640018f4 100644
--- a/src/Runtime/api/studio3dqml/q3dsplugin.cpp
+++ b/src/Runtime/api/studio3dqml/q3dsplugin.cpp
@@ -34,8 +34,8 @@
#include <QtStudio3D/private/q3dsviewersettings_p.h>
-#include "q3dsstudio3d.h"
-#include "q3dspresentationitem.h"
+#include "q3dsstudio3d_p.h"
+#include "q3dspresentationitem_p.h"
#include "q3dsqmlstream.h"
#include "q3dsqmlsubpresentationsettings.h"
#include "q3dssceneelement.h"
diff --git a/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp b/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp
index d588c419..cb571d87 100644
--- a/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp
+++ b/src/Runtime/api/studio3dqml/q3dspresentationitem.cpp
@@ -27,7 +27,7 @@
**
****************************************************************************/
-#include "q3dspresentationitem.h"
+#include "q3dspresentationitem_p.h"
#include <QtStudio3D/q3dssceneelement.h>
#include <QtStudio3D/q3dsdatainput.h>
diff --git a/src/Runtime/api/studio3dqml/q3dspresentationitem.h b/src/Runtime/api/studio3dqml/q3dspresentationitem_p.h
index 3ee2964f..757f34fa 100644
--- a/src/Runtime/api/studio3dqml/q3dspresentationitem.h
+++ b/src/Runtime/api/studio3dqml/q3dspresentationitem_p.h
@@ -30,6 +30,17 @@
#ifndef Q3DSPRESENTATIONITEM_H
#define Q3DSPRESENTATIONITEM_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the QtStudio3D 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 "q3dsqmlsubpresentationsettings.h"
#include <QtStudio3D/q3dspresentation.h>
diff --git a/src/Runtime/api/studio3dqml/q3dsrenderer.cpp b/src/Runtime/api/studio3dqml/q3dsrenderer.cpp
index d4be1769..a3d7b2d8 100644
--- a/src/Runtime/api/studio3dqml/q3dsrenderer.cpp
+++ b/src/Runtime/api/studio3dqml/q3dsrenderer.cpp
@@ -28,10 +28,10 @@
**
****************************************************************************/
-#include "q3dsrenderer.h"
+#include "q3dsrenderer_p.h"
#include "Qt3DSViewerApp.h"
#include "Qt3DSAudioPlayerImpl.h"
-#include "q3dspresentationitem.h"
+#include "q3dspresentationitem_p.h"
#include <QtStudio3D/private/q3dscommandqueue_p.h>
#include <QtStudio3D/private/q3dsviewersettings_p.h>
diff --git a/src/Runtime/api/studio3dqml/q3dsrenderer.h b/src/Runtime/api/studio3dqml/q3dsrenderer_p.h
index 230980ba..6d044ff7 100644
--- a/src/Runtime/api/studio3dqml/q3dsrenderer.h
+++ b/src/Runtime/api/studio3dqml/q3dsrenderer_p.h
@@ -31,11 +31,22 @@
#ifndef Q3DS_RENDERER_H
#define Q3DS_RENDERER_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the QtStudio3D 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 <QtGui/qopenglframebufferobject.h>
#include <QtQuick/qquickframebufferobject.h>
#include "Qt3DSViewerApp.h"
-#include "q3dsstudio3d.h"
+#include "q3dsstudio3d_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp b/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp
index 5770e176..41f59f44 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp
+++ b/src/Runtime/api/studio3dqml/q3dsstudio3d.cpp
@@ -28,9 +28,9 @@
**
****************************************************************************/
-#include "q3dsstudio3d.h"
-#include "q3dsrenderer.h"
-#include "q3dspresentationitem.h"
+#include "q3dsstudio3d_p.h"
+#include "q3dsrenderer_p.h"
+#include "q3dspresentationitem_p.h"
#include <QtStudio3D/private/q3dsviewersettings_p.h>
#include <QtStudio3D/private/q3dspresentation_p.h>
diff --git a/src/Runtime/api/studio3dqml/q3dsstudio3d.h b/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h
index f27dbf17..0fd3b9d0 100644
--- a/src/Runtime/api/studio3dqml/q3dsstudio3d.h
+++ b/src/Runtime/api/studio3dqml/q3dsstudio3d_p.h
@@ -31,6 +31,17 @@
#ifndef Q3DS_STUDIO3D_H
#define Q3DS_STUDIO3D_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the QtStudio3D 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 <QtStudio3D/private/q3dscommandqueue_p.h>
#include <QtGui/qopenglframebufferobject.h>
#include <QtQuick/qquickframebufferobject.h>
diff --git a/src/Runtime/api/studio3dqml/studio3dqml.pro b/src/Runtime/api/studio3dqml/studio3dqml.pro
index a7bdc392..b62a3424 100644
--- a/src/Runtime/api/studio3dqml/studio3dqml.pro
+++ b/src/Runtime/api/studio3dqml/studio3dqml.pro
@@ -20,9 +20,9 @@ SOURCES += \
HEADERS += \
q3dsplugin.h \
- q3dsstudio3d.h \
- q3dsrenderer.h \
- q3dspresentationitem.h
+ q3dsrenderer_p.h \
+ q3dsstudio3d_p.h \
+ q3dspresentationitem_p.h
LIBS += \
-lqt3dsopengl$$qtPlatformTargetSuffix() \