Make qml api headers privatev2.4.0-beta1

Task-number: QT3DS-3567
Change-Id: Ie093ae736b2fd9ff7d5d868196e6703f678df1b2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 

11 files changed, 50 insertions, 17 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() \
diff --git a/src/Viewer/Qt3DViewer/Qt3DViewer.pro b/src/Viewer/Qt3DViewer/Qt3DViewer.pro
index 65c4d972..25345d3c 100644
--- a/src/Viewer/Qt3DViewer/Qt3DViewer.pro
+++ b/src/Viewer/Qt3DViewer/Qt3DViewer.pro
@@ -21,9 +21,9 @@ SOURCES += \
     remotedeploymentreceiver.cpp
 
 HEADERS += \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d.h \
-    $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer.h \
-    $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem.h \
+    $$PWD/../../Runtime/api/studio3dqml/q3dsstudio3d_p.h \
+    $$PWD/../../Runtime/api/studio3dqml/q3dsrenderer_p.h \
+    $$PWD/../../Runtime/api/studio3dqml/q3dspresentationitem_p.h \
     viewer.h \
     remotedeploymentreceiver.h
 
diff --git a/src/Viewer/Qt3DViewer/viewer.cpp b/src/Viewer/Qt3DViewer/viewer.cpp
index b6ce05b7..bb6af59f 100644
--- a/src/Viewer/Qt3DViewer/viewer.cpp
+++ b/src/Viewer/Qt3DViewer/viewer.cpp
@@ -37,7 +37,7 @@
 #include <QtQuick/qquickwindow.h>
 
 #include "viewer.h"
-#include "q3dspresentationitem.h"
+#include "q3dspresentationitem_p.h"
 
 Viewer::Viewer(bool generatorMode, QObject *parent)
     : QObject(parent)
diff --git a/src/Viewer/Qt3DViewer/viewer.h b/src/Viewer/Qt3DViewer/viewer.h
index cff7a23c..1ce514ad 100644
--- a/src/Viewer/Qt3DViewer/viewer.h
+++ b/src/Viewer/Qt3DViewer/viewer.h
@@ -36,7 +36,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qtimer.h>
 #include <QtGui/qwindow.h>
-#include "q3dsstudio3d.h"
+#include "q3dsstudio3d_p.h"
 
 class Viewer : public QObject
 {