Doc: Fix dependencies and navigation2.0

- Qt 5.11.1 uses a single documentation project for Qt 3D (qt3d).
  Keep the old qt3d* dependencies for now.
- Add a dependency to qtquickcontrols2.
- Fix navigation so that Runtime docs appear under Qt 3D Studio.

Change-Id: I88e681257da7742f71e1f717bd3b5c384f196a8a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/runtime/doc/qt3d-runtime-project.qdocconf b/src/runtime/doc/qt3d-runtime-project.qdocconf
index 5cf0998..f47d9ce 100644
--- a/src/runtime/doc/qt3d-runtime-project.qdocconf
+++ b/src/runtime/doc/qt3d-runtime-project.qdocconf
@@ -17,7 +17,10 @@ headerdirs              += ../../imports/studio3d
 sourcedirs              += ../behaviorapi
 headerdirs              += ../behaviorapi
 
-depends = qtcore qtgui qtwidgets qtqml qtquick qtdoc qt3dcore qt3drender qt3dlogic qt3danimation
+depends = qtcore qtgui qtwidgets qtqml qtquick qtquickcontrols2 qt3dstudio qtdoc qt3d
+
+# TODO: remove these once they're no longer needed
+depends += qt3dcore qt3drender qt3dlogic qt3danimation
 
 qhp.projects            = Qt3DStudioRuntime2
 
@@ -50,7 +53,10 @@ qhp.Qt3DStudioRuntime2.subprojects.classes.sortPages  = true
 # Add an .html file with sidebar content, used in the online style
 HTML.stylesheets             += style/qt5-sidebar.html
 
-navigation.homepage            = Qt 3D Studio Runtime
+navigation.homepage            = "Qt 3D Studio Index"
+navigation.hometitle           = "Qt 3D Studio"
+navigation.landingpage         = "Qt 3D Studio Runtime"
+navigation.landingtitle        = Runtime
 navigation.cppclassespage      = Qt 3D Studio Runtime C++ Classes
 navigation.qmltypespage        = Qt 3D Studio Runtime QML Types
 buildversion                   = "Qt 3D Studio Runtime 2.0 Manual"