summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/getting-started/examples.qdoc4
-rw-r--r--doc/src/platforms/x11overlays.qdoc1
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf11
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 708c44e..e8c85e6 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -255,6 +255,7 @@
\o \l{graphicsview/flowlayout}{Flow Layout}
\o \l{graphicsview/simpleanchorlayout}{Simple Anchor Layout}
\o \l{graphicsview/weatheranchorlayout}{Weather Anchor Layout}
+ \o \l{graphicsview/basicgraphicslayouts}{Basic Graphics Layouts}
\endlist
Some examples demonstrate the use of graphics effects with canvas items.
@@ -471,6 +472,7 @@
\o \l{network/googlesuggest}{Google Suggest}
\o \l{network/bearercloud}{Bearer Cloud}\raisedaster
\o \l{network/bearermonitor}{Bearer Monitor}
+ \o \l{network/securesocketclient}{Secure Socket Client}
\endlist
Examples marked with an asterisk (*) are fully documented.
@@ -609,6 +611,7 @@
\o \l{sql/querymodel}{Query Model}
\o \l{sql/relationaltablemodel}{Relational Table Model}
\o \l{sql/tablemodel}{Table Model}
+ \o \l{sql/masterdetail}{Master Detail}
\o \l{sql/sqlwidgetmapper}{SQL Widget Mapper}\raisedaster
\endlist
@@ -633,6 +636,7 @@
\o \l{xml/streambookmarks}{QXmlStream Bookmarks}\raisedaster
\o \l{xml/rsslisting}{RSS-Listing}
\o \l{xml/xmlstreamlint}{XML Stream Lint Example}\raisedaster
+ \o \l{xml/htmlinfo}{XML HTML Info}
\endlist
The XQuery/XPath and XML Schema engines in the QtXmlPatterns modules
diff --git a/doc/src/platforms/x11overlays.qdoc b/doc/src/platforms/x11overlays.qdoc
index 1a03ea6..949a500 100644
--- a/doc/src/platforms/x11overlays.qdoc
+++ b/doc/src/platforms/x11overlays.qdoc
@@ -28,6 +28,7 @@
/*!
\page x11overlays.html
\title How to Use X11 Overlays with Qt
+ \ingroup best-practices
X11 overlays are a powerful mechanism for drawing
annotations etc., on top of an image without destroying it, thus saving
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index c70bcaf..8d4d27f 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -98,10 +98,13 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" Qt Topics</h2>\n" \
" <div id=\"list002\" class=\"list\">\n" \
" <ul id=\"ul002\" >\n" \
- " <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+ " <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
+ " <li><a href=\"qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+ " <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
+ " <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
+ " <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+ " <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
+ " <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
" </ul> \n" \
" </div>\n" \
" </div>\n" \