From 200cad26f258a998d3dc8089445d2c6ae9639ab5 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 4 Mar 2013 14:06:33 +0100 Subject: Doc: Adding navigation configs in the module qdocconf files. -The navigation bar requires the titles of the landing page and relevant pages. Change-Id: I5d5986b2bf74205cd49957b63fd6ac4e32cbb36b Reviewed-by: Martin Smith --- src/concurrent/doc/qtconcurrent.qdocconf | 3 +++ src/corelib/doc/qtcore.qdocconf | 3 +++ src/dbus/doc/qtdbus.qdocconf | 5 ++++- src/gui/doc/qtgui.qdocconf | 3 +++ src/network/doc/qtnetwork.qdocconf | 3 +++ src/opengl/doc/qtopengl.qdocconf | 5 ++++- src/printsupport/doc/qtprintsupport.qdocconf | 3 +++ src/sql/doc/qtsql.qdocconf | 3 +++ src/testlib/doc/qttestlib.qdocconf | 3 +++ src/tools/qdoc/doc/config/qdoc.qdocconf | 2 ++ src/widgets/doc/qtwidgets.qdocconf | 3 +++ src/xml/doc/qtxml.qdocconf | 3 +++ 12 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf index 3d5e9de5e0..7fa437c17f 100644 --- a/src/concurrent/doc/qtconcurrent.qdocconf +++ b/src/concurrent/doc/qtconcurrent.qdocconf @@ -40,3 +40,6 @@ exampledirs += ../../../examples/qtconcurrent \ excludedirs += ../../../examples/widgets/doc imagedirs += images + +navigation.landingpage = "Qt Concurrent" +navigation.cppclassespage = "Qt Concurrent C++ Classes" diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 0e275ee8d4..c74a2b4761 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -39,3 +39,6 @@ exampledirs += \ ../../../examples/tools/ imagedirs += images + +navigation.landingpage = "Qt Core" +navigation.cppclassespage = "Qt Core C++ Classes" diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf index b47e02ff43..1233ae3d47 100644 --- a/src/dbus/doc/qtdbus.qdocconf +++ b/src/dbus/doc/qtdbus.qdocconf @@ -20,7 +20,7 @@ excludedirs += ../../../examples/widgets/doc examplesinstallpath = dbus -depends += qtcore +depends += qtdoc qtcore # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -49,3 +49,6 @@ qhp.QtDBus.subprojects.classes.title = C++ Classes qhp.QtDBus.subprojects.classes.indexTitle = Qt D-Bus C++ Classes qhp.QtDBus.subprojects.classes.selectors = class fake:headerfile qhp.QtDBus.subprojects.classes.sortPages = true + +navigation.landingpage = "Qt D-Bus" +navigation.cppclassespage = "Qt D-Bus C++ Classes" diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf index 5073dd7f0f..ed30172376 100644 --- a/src/gui/doc/qtgui.qdocconf +++ b/src/gui/doc/qtgui.qdocconf @@ -48,3 +48,6 @@ exampledirs += ../../../examples/gui \ imagedirs += images \ ../../../examples/gui/doc/images \ ../../../doc/src/images \ + +navigation.landingpage = "Qt GUI" +navigation.cppclassespage = "Qt GUI C++ Classes" diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf index 048b3325b6..f4779ae8fe 100644 --- a/src/network/doc/qtnetwork.qdocconf +++ b/src/network/doc/qtnetwork.qdocconf @@ -40,3 +40,6 @@ exampledirs += ../../../examples/network \ imagedirs += images \ ../../../examples/network/doc/images + +navigation.landingpage = "Qt Network" +navigation.cppclassespage = "Qt Network C++ Classes" diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf index e76a23844b..5b6d09dfcd 100644 --- a/src/opengl/doc/qtopengl.qdocconf +++ b/src/opengl/doc/qtopengl.qdocconf @@ -19,7 +19,7 @@ exampledirs += ../../../examples/opengl \ imagedirs += images \ ../../../examples/opengl/doc/images -depends += qtcore qtgui qtwidgets +depends += qtdoc qtcore qtgui qtwidgets examplesinstallpath = opengl @@ -50,3 +50,6 @@ qhp.QtOpenGL.subprojects.classes.title = C++ Classes qhp.QtOpenGL.subprojects.classes.indexTitle = Qt OpenGL C++ Classes qhp.QtOpenGL.subprojects.classes.selectors = class fake:headerfile qhp.QtOpenGL.subprojects.classes.sortPages = true + +navigation.landingpage = "Qt OpenGL" +navigation.cppclassespage = "Qt OpenGL C++ Classes" diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf index c7b14e16c1..d5015fa46a 100644 --- a/src/printsupport/doc/qtprintsupport.qdocconf +++ b/src/printsupport/doc/qtprintsupport.qdocconf @@ -40,3 +40,6 @@ excludedirs += ../../../examples/widgets/doc imagedirs += images \ ../../widgets/doc/images \ + +navigation.landingpage = "Qt Print Support" +navigation.cppclassespage = "Qt Print Support C++ Classes" diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf index c2686079d5..a2a05d7c8a 100644 --- a/src/sql/doc/qtsql.qdocconf +++ b/src/sql/doc/qtsql.qdocconf @@ -39,3 +39,6 @@ exampledirs += ../../../examples/sql \ imagedirs += images \ ../../../examples/sql/doc/images + +navigation.landingpage = "Qt SQL" +navigation.cppclassespage = "Qt SQL C++ Classes" diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf index 2eea4f246a..ab2bdc1948 100644 --- a/src/testlib/doc/qttestlib.qdocconf +++ b/src/testlib/doc/qttestlib.qdocconf @@ -40,3 +40,6 @@ exampledirs += ../../../examples/qtestlib \ excludedirs += ../../../examples/widgets/doc imagedirs += images + +navigation.landingpage = "Qt Test" +navigation.cppclassespage = "Qt Test C++ Classes" diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf index a7fbb38463..a6ae18a675 100644 --- a/src/tools/qdoc/doc/config/qdoc.qdocconf +++ b/src/tools/qdoc/doc/config/qdoc.qdocconf @@ -70,3 +70,5 @@ depends += \ qtwebkitexamples \ qtxml \ qtxmlpatterns + +navigation.landingpage = "QDoc Manual" diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index a989ef9363..d3c7825bc0 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.qdocconf @@ -54,3 +54,6 @@ imagedirs += images \ ../../../doc/src/images \ ../../../examples/widgets/doc/images \ ../../../examples/widgets + +navigation.landingpage = "Qt Widgets" +navigation.cppclassespage = "Qt Widgets C++ Classes" diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf index 4e8cf34b0c..f9c847e022 100644 --- a/src/xml/doc/qtxml.qdocconf +++ b/src/xml/doc/qtxml.qdocconf @@ -40,3 +40,6 @@ exampledirs += ../../../examples/xml \ imagedirs += images \ ../../../examples/xml/images + +navigation.landingpage = "Qt XML" +navigation.cppclassespage = "Qt XML C++ Classes" -- cgit v1.2.3