Mark View3D and Studio3DProfiler as internal for now

Also move the example to tests/manual.

Hide all public references to these types for now. They are fully usable
of course. To be re-enabled in a later release.

Change-Id: Ib7f6a53eed131280307821e1f63ddac9856e33fe
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

15 files changed, 7 insertions, 79 deletions

diff --git a/examples/3dstudioruntime2/3dstudioruntime2.pro b/examples/3dstudioruntime2/3dstudioruntime2.pro
index 37e384d..1ad83f1 100644
--- a/examples/3dstudioruntime2/3dstudioruntime2.pro
+++ b/examples/3dstudioruntime2/3dstudioruntime2.pro
@@ -6,8 +6,7 @@ SUBDIRS += \
 
 qtHaveModule(quick) {
     SUBDIRS += simpleqml \
-               qmldatainput \
-               layersinquick
+               qmldatainput
 }
 
 qtHaveModule(widgets) {
diff --git a/src/imports/studio3d/q3dsstudio3ditem.cpp b/src/imports/studio3d/q3dsstudio3ditem.cpp
index 25a4d8c..ce7a169 100644
--- a/src/imports/studio3d/q3dsstudio3ditem.cpp
+++ b/src/imports/studio3d/q3dsstudio3ditem.cpp
@@ -94,59 +94,6 @@ QT_BEGIN_NAMESPACE
     }
     \endqml
 
-    \section2 Alternative usage
-
-    The above example shows the 3D content in the Studio3D item. Qt 3D Studio
-    presentations consist of one or more layers, each of which is a 3D scene
-    with its own camera and lights. The output of each layer is then composed
-    together into a final image, taking layer position, size, and blending into
-    account. Studio3D shows this final image by default.
-
-    In many cases it can be beneficial to follow a different model: instead of
-    displaying the final, composed content in a single Studio3D item, it is
-    also possible to manage the Qt 3D Studio layers individually as Qt Quick
-    items, thus moving the layer composition into Qt Quick's domain. The 3D
-    engine's final image is not generated at all in this case. The key enabler
-    for this approach is the \l View3D type.
-
-    \qml
-    Studio3D {
-        id: studio3D
-        Presentation {
-            source: "qrc:///presentation.uia"
-            SceneElement {
-                id: scene
-                elementPath: "Scene"
-                currentSlideIndex: 2
-            }
-            Element {
-                id: textLabel
-                elementPath: "Scene.Layer.myLabel"
-            }
-        }
-        onRunningChanged: {
-            console.log("Presentation ready!");
-        }
-    }
-
-    View3D {
-        engine: studio3D
-        source: "LayerName"
-        anchors.fill: parent
-    }
-    \endqml
-
-    In this modified example the Studio3D item does not display any content,
-    while the View3D item displays only the content of a single layer,
-    referenced by the name set in the Qt 3D Studio application. This approach
-    enables creating interfaces where multiple different pieces of 3D content
-    is blended with the 2D user interface, instead of being restricted to a
-    single rectangular area defined by the Studio3D item.
-
-    \note Multiple Studio3D items should be avoided. Prefer using \l View3D
-    whenever there is a need to display 3D content in multiple areas of the
-    screen.
-
     \section2 Controlling the presentation
 
     Like the example above suggests, Studio3D and the other types under the
@@ -170,7 +117,7 @@ QT_BEGIN_NAMESPACE
 
     \endlist
 
-    \sa View3D, Presentation
+    \sa Presentation
 */
 
 /*!
diff --git a/src/imports/studio3d/q3dsstudio3dview.cpp b/src/imports/studio3d/q3dsstudio3dview.cpp
index 961b265..0f48423 100644
--- a/src/imports/studio3d/q3dsstudio3dview.cpp
+++ b/src/imports/studio3d/q3dsstudio3dview.cpp
@@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE
     \inherits Item
     \keyword View3D
 
+    \internal
+
     \brief An item rendering the contents of a single layer from a Qt 3D Studio presentation.
 
     View3D items display the contents of a single Qt 3D Studio layer. This
diff --git a/src/runtime/api/q3dspresentation.cpp b/src/runtime/api/q3dspresentation.cpp
index 6c502e1..51ba0fe 100644
--- a/src/runtime/api/q3dspresentation.cpp
+++ b/src/runtime/api/q3dspresentation.cpp
@@ -746,10 +746,6 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
     property has no effect.
 
     Default value is \c{false}.
-
-    \note This property has no effect when using \l View3D items in the Qt
-    Quick scene, because the profile views are managed by Qt Quick, not the 3D
-    engine then. Use \l Studio3DProfiler in that case.
 */
 
 /*!
@@ -758,10 +754,6 @@ void Q3DSPresentationPrivate::registerInlineQmlSubPresentations(const QVector<Q3
     Controls the scale factor of the in-scene debug and profile views.
 
     The default value is 1.0.
-
-    \note This property has no effect when using \l View3D items in the Qt
-    Quick scene, because the profile views are managed by Qt Quick, not the 3D
-    engine then. Use \l Studio3DProfiler in that case.
 */
 
 /*!
diff --git a/src/runtime/api/q3dsviewersettings.cpp b/src/runtime/api/q3dsviewersettings.cpp
index d2d488c..3d4f3fe 100644
--- a/src/runtime/api/q3dsviewersettings.cpp
+++ b/src/runtime/api/q3dsviewersettings.cpp
@@ -125,10 +125,6 @@ QColor Q3DSViewerSettings::matteColor() const
     property has no effect.
 
     Default value is \c{false}.
-
-    \note This property has no effect when using \l View3D items in the Qt
-    Quick scene, because the profile views are managed by Qt Quick, not the 3D
-    engine then. Use \l Studio3DProfiler in that case.
 */
 bool Q3DSViewerSettings::isShowingRenderStats() const
 {
@@ -276,11 +272,6 @@ Q3DSViewportSettings *Q3DSViewerSettingsPrivate::createViewportSettingsProxy()
 
     This type provides properties to define presentation independent viewer settings.
 
-    \note ViewerSettings are only applicable when \l Studio3D is used in the
-    default mode, showing the final, composed image from the Qt 3D Studio
-    renderer. ViewerSettings has no effect when using \l View3D items to
-    render layers individually.
-
     \sa Studio3D
 */
 
diff --git a/src/runtime/profileui/q3dsimguiitem.cpp b/src/runtime/profileui/q3dsimguiitem.cpp
index 27ecb99..a7d85c8 100644
--- a/src/runtime/profileui/q3dsimguiitem.cpp
+++ b/src/runtime/profileui/q3dsimguiitem.cpp
@@ -50,7 +50,8 @@ QT_BEGIN_NAMESPACE
     \ingroup 3dstudioruntime2
     \inherits Item
     \keyword Studio3DProfiler
-    \since Qt 3D Studio 2.1
+
+    \internal
 
     \brief An item rendering profile and debug views in Qt Quick
 
diff --git a/examples/3dstudioruntime2/layersinquick/doc/images/layersinquick.png b/tests/manual/layersinquick/doc/images/layersinquick.png
index d486b90..d486b90 100644
--- a/examples/3dstudioruntime2/layersinquick/doc/images/layersinquick.png
+++ b/tests/manual/layersinquick/doc/images/layersinquick.png
diff --git a/examples/3dstudioruntime2/layersinquick/doc/src/layersinquick.qdoc b/tests/manual/layersinquick/doc/src/layersinquick.qdoc
index 46ed0f7..46ed0f7 100644
--- a/examples/3dstudioruntime2/layersinquick/doc/src/layersinquick.qdoc
+++ b/tests/manual/layersinquick/doc/src/layersinquick.qdoc
diff --git a/examples/3dstudioruntime2/layersinquick/layers.uip b/tests/manual/layersinquick/layers.uip
index 171f226..171f226 100644
--- a/examples/3dstudioruntime2/layersinquick/layers.uip
+++ b/tests/manual/layersinquick/layers.uip
diff --git a/examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip b/tests/manual/layersinquick/layers_ssaa_msaa.uip
index 9396fa8..9396fa8 100644
--- a/examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip
+++ b/tests/manual/layersinquick/layers_ssaa_msaa.uip
diff --git a/examples/3dstudioruntime2/layersinquick/layersinquick.pro b/tests/manual/layersinquick/layersinquick.pro
index f26e1c4..6a7ee56 100644
--- a/examples/3dstudioruntime2/layersinquick/layersinquick.pro
+++ b/tests/manual/layersinquick/layersinquick.pro
@@ -1,5 +1,3 @@
-TEMPLATE = app
-
 QT += quick 3dstudioruntime2
 
 SOURCES += \
@@ -9,6 +7,3 @@ RESOURCES += layersinquick.qrc
 
 OTHER_FILES += \
     main.qml
-
-target.path = $$[QT_INSTALL_EXAMPLES]/3dstudioruntime2/$$TARGET
-INSTALLS += target
diff --git a/examples/3dstudioruntime2/layersinquick/layersinquick.qrc b/tests/manual/layersinquick/layersinquick.qrc
index e487405..e487405 100644
--- a/examples/3dstudioruntime2/layersinquick/layersinquick.qrc
+++ b/tests/manual/layersinquick/layersinquick.qrc
diff --git a/examples/3dstudioruntime2/layersinquick/main.cpp b/tests/manual/layersinquick/main.cpp
index 728e75d..728e75d 100644
--- a/examples/3dstudioruntime2/layersinquick/main.cpp
+++ b/tests/manual/layersinquick/main.cpp
diff --git a/examples/3dstudioruntime2/layersinquick/main.qml b/tests/manual/layersinquick/main.qml
index 9fd3da9..9fd3da9 100644
--- a/examples/3dstudioruntime2/layersinquick/main.qml
+++ b/tests/manual/layersinquick/main.qml
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 6610fe6..e2a6b4a 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -7,5 +7,6 @@ qtHaveModule(widgets) {
 }
 qtHaveModule(quick) {
     SUBDIRS += \
+        layersinquick \
         pureqml3d
 }