summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2019-06-21 09:13:54 +0200
committerTopi Reinio <topi.reinio@qt.io>2019-06-21 10:06:19 +0200
commitb7e6c7d983bdbf1e508f9bd5fc751e74c499e907 (patch)
tree953b64758bc5dcac04a90e02c39dc45d0ca9e696 /src
parent278a34e255942302b87808d96c128984d04bb7a2 (diff)
Doc: Update OpenGL runtime project name
.qch generation fails unless the project name matches with the target directory name. Change-Id: I391c386afd253dfaf81c2a888d9f0931dff93a83 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/api/studio3d/doc/doc.pri4
-rw-r--r--src/api/studio3d/doc/online/qtstudio3d.qdocconf (renamed from src/api/studio3d/doc/online/qt3dstudio-opengl-runtime.qdocconf)0
-rw-r--r--src/api/studio3d/doc/qt3dstudio-opengl-runtime-project.qdocconf44
-rw-r--r--src/api/studio3d/doc/qtstudio3d.qdocconf (renamed from src/api/studio3d/doc/qt3dstudio-opengl-runtime.qdocconf)0
-rw-r--r--src/api/studio3d/doc/src/toc.qdoc2
5 files changed, 24 insertions, 26 deletions
diff --git a/src/api/studio3d/doc/doc.pri b/src/api/studio3d/doc/doc.pri
index f2817aa..ec30e40 100644
--- a/src/api/studio3d/doc/doc.pri
+++ b/src/api/studio3d/doc/doc.pri
@@ -1,7 +1,7 @@
build_online_docs: \
- QMAKE_DOCS = $$PWD/online/qt3dstudio-opengl-runtime.qdocconf
+ QMAKE_DOCS = $$PWD/online/qtstudio3d.qdocconf
else: \
- QMAKE_DOCS = $$PWD/qt3dstudio-opengl-runtime.qdocconf
+ QMAKE_DOCS = $$PWD/qtstudio3d.qdocconf
OTHER_FILES += \
$$PWD/src/*.qdoc \
diff --git a/src/api/studio3d/doc/online/qt3dstudio-opengl-runtime.qdocconf b/src/api/studio3d/doc/online/qtstudio3d.qdocconf
index a1dd74d..a1dd74d 100644
--- a/src/api/studio3d/doc/online/qt3dstudio-opengl-runtime.qdocconf
+++ b/src/api/studio3d/doc/online/qtstudio3d.qdocconf
diff --git a/src/api/studio3d/doc/qt3dstudio-opengl-runtime-project.qdocconf b/src/api/studio3d/doc/qt3dstudio-opengl-runtime-project.qdocconf
index 9729d50..ece96a5 100644
--- a/src/api/studio3d/doc/qt3dstudio-opengl-runtime-project.qdocconf
+++ b/src/api/studio3d/doc/qt3dstudio-opengl-runtime-project.qdocconf
@@ -1,4 +1,4 @@
-project = Qt3DStudioOpenGLRuntime
+project = QtStudio3D
description = Qt 3D Studio OpenGL Runtime Reference
version = $QT_VERSION
# url is relative to the parent project
@@ -17,38 +17,35 @@ imagedirs += ./src/images
depends = qtcore qtgui qtwidgets qtqml qtquick qtquickcontrols qt3dstudio qt3dstudioruntime2 qtdoc qmake
-qhp.projects = Qt3DStudioOpenGLRuntime
+qhp.projects = QtStudio3D
-qhp.Qt3DStudioOpenGLRuntime.file = qt3dstudio-openglruntime.qhp
-qhp.Qt3DStudioOpenGLRuntime.namespace = io.qt.qt3dstudio-openglruntime.$QT_VERSION_TAG
-qhp.Qt3DStudioOpenGLRuntime.virtualFolder = qt3dstudio-openglruntime
-qhp.Qt3DStudioOpenGLRuntime.indexTitle = Qt 3D Studio OpenGL Runtime
-qhp.Qt3DStudioOpenGLRuntime.indexRoot =
+qhp.QtStudio3D.file = qtstudio3d.qhp
+qhp.QtStudio3D.namespace = io.qt.qtstudio3d.$QT_VERSION_TAG
+qhp.QtStudio3D.virtualFolder = qtstudio3d
+qhp.QtStudio3D.indexTitle = Qt 3D Studio OpenGL Runtime
+qhp.QtStudio3D.indexRoot =
-qhp.Qt3DStudioOpenGLRuntime.filterAttributes = qt3dstudio-openglruntime $QT_VER
-qhp.Qt3DStudioOpenGLRuntime.customFilters.Qt.name = Qt3DStudioOpenGLRuntime $QT_VER
-qhp.Qt3DStudioOpenGLRuntime.customFilters.Qt.filterAttributes = qt3dstudio-openglruntime $QT_VER
+qhp.QtStudio3D.filterAttributes = qtstudio3d $QT_VER
+qhp.QtStudio3D.customFilters.Qt.name = QtStudio3D $QT_VER
+qhp.QtStudio3D.customFilters.Qt.filterAttributes = qtstudio3d $QT_VER
-qhp.Qt3DStudioOpenGLRuntime.subprojects = manual qmltypes classes
+qhp.QtStudio3D.subprojects = qmltypes classes
-qhp.Qt3DStudioOpenGLRuntime.subprojects.manual.title = Qt 3D Studio OpenGL Runtime
-qhp.Qt3DStudioOpenGLRuntime.subprojects.manual.indexTitle = Qt 3D Studio OpenGL Runtime TOC
-qhp.Qt3DStudioOpenGLRuntime.subprojects.manual.type = manual
+qhp.QtStudio3D.subprojects.qmltypes.title = QML Types
+qhp.QtStudio3D.subprojects.qmltypes.indexTitle = Qt 3D Studio OpenGL Runtime QML Types
+qhp.QtStudio3D.subprojects.qmltypes.selectors = qmltype
+qhp.QtStudio3D.subprojects.qmltypes.sortPages = true
-qhp.Qt3DStudioOpenGLRuntime.subprojects.qmltypes.title = QML Types
-qhp.Qt3DStudioOpenGLRuntime.subprojects.qmltypes.indexTitle = Qt 3D Studio OpenGL Runtime QML Types
-qhp.Qt3DStudioOpenGLRuntime.subprojects.qmltypes.selectors = qmltype
-qhp.Qt3DStudioOpenGLRuntime.subprojects.qmltypes.sortPages = true
-
-qhp.Qt3DStudioOpenGLRuntime.subprojects.classes.title = C++ Classes
-qhp.Qt3DStudioOpenGLRuntime.subprojects.classes.indexTitle = Qt 3D Studio OpenGL Runtime C++ Classes
-qhp.Qt3DStudioOpenGLRuntime.subprojects.classes.selectors = class namespace doc:headerfile
-qhp.Qt3DStudioOpenGLRuntime.subprojects.classes.sortPages = true
+qhp.QtStudio3D.subprojects.classes.title = C++ Classes
+qhp.QtStudio3D.subprojects.classes.indexTitle = Qt 3D Studio OpenGL Runtime C++ Classes
+qhp.QtStudio3D.subprojects.classes.selectors = class namespace doc:headerfile
+qhp.QtStudio3D.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 OpenGL Runtime"
+navigation.hometitle = "Qt 3D Studio OpenGL Runtime"
navigation.hometitle = "OpenGL Runtime"
navigation.landingpage = "Qt 3D Studio OpenGL Runtime"
navigation.landingtitle = OpenGL Runtime
@@ -63,3 +60,4 @@ macro.RUNTIME = Qt 3D Studio OpenGL Runtime
# exampledirs += ../examples/studio3d
Cpp.ignoretokens += Q3DSV_EXPORT Q_STUDIO3D_EXPORT
+depends += qt3d
diff --git a/src/api/studio3d/doc/qt3dstudio-opengl-runtime.qdocconf b/src/api/studio3d/doc/qtstudio3d.qdocconf
index 9b76104..9b76104 100644
--- a/src/api/studio3d/doc/qt3dstudio-opengl-runtime.qdocconf
+++ b/src/api/studio3d/doc/qtstudio3d.qdocconf
diff --git a/src/api/studio3d/doc/src/toc.qdoc b/src/api/studio3d/doc/src/toc.qdoc
index e8f5837..979f084 100644
--- a/src/api/studio3d/doc/src/toc.qdoc
+++ b/src/api/studio3d/doc/src/toc.qdoc
@@ -35,6 +35,6 @@ This file is used for generating a TOC in a .qch file.
\endomit
\list
- \li \l {index.html}{Overview}
+ \li \l {\RUNTIME}{Overview}
\endlist
*/