QtTools: Doc: Fixing links in designer and assistant.

Change-Id: I98ff1c2dd615cbe3a79f19bada8964082ce8f21f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h
index abcfe8e..0773619 100644 (file)
--- a/examples/designer/containerextension/multipagewidgetplugin.h
+++ b/examples/designer/containerextension/multipagewidgetplugin.h
@@ -52,7 +52,9 @@ QT_END_NAMESPACE
 class MultiPageWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+//! [1]
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidget" FILE "multipagewidget.json")
+//! [1]
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 public:
     MultiPageWidgetPlugin(QObject *parent = 0);

diff --git a/examples/designer/doc/src/containerextension.qdoc b/examples/designer/doc/src/containerextension.qdoc
index 07231a6..093993a 100644 (file)
--- a/examples/designer/doc/src/containerextension.qdoc
+++ b/examples/designer/doc/src/containerextension.qdoc
@@ -344,7 +344,7 @@
     page; any inital pages of a multi-page widget must be specified
     within this function.
 
-    \snippet containerextension/multipagewidgetplugin.cpp 14
+    \snippet containerextension/multipagewidgetplugin.h 1
 
     Remember to use the Q_PLUGIN_METADATA() macro to export the
     MultiPageWidgetPlugin class for use with Qt's plugin handling

diff --git a/examples/designer/doc/src/taskmenuextension.qdoc b/examples/designer/doc/src/taskmenuextension.qdoc
index 7712486..ee80bad 100644 (file)
--- a/examples/designer/doc/src/taskmenuextension.qdoc
+++ b/examples/designer/doc/src/taskmenuextension.qdoc
@@ -252,7 +252,7 @@
     default settings for the widget in the standard XML format used by
     Qt Designer), since no default values are necessary.
 
-    \snippet taskmenuextension/tictactoeplugin.cpp 4
+    \snippet taskmenuextension/tictactoeplugin.h 1
 
     Finally, we use the Q_PLUGIN_METADATA() macro to export the
     TicTacToePlugin class for use with Qt's plugin handling classes:

diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h
index 70f7552..cfbb754 100644 (file)
--- a/examples/designer/taskmenuextension/tictactoeplugin.h
+++ b/examples/designer/taskmenuextension/tictactoeplugin.h
@@ -52,7 +52,9 @@ QT_END_NAMESPACE
 class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+//! [1]
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "tictactoe.json")
+//! [1]
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public:

diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index cead9e5..befb5d4 100644 (file)
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -575,7 +575,8 @@ void QHelpSearchQueryWidget::focusInEvent(QFocusEvent *focusEvent)
     }
 }
 
-/*! \reimp
+/*!
+    \reimp
 */
 void QHelpSearchQueryWidget::changeEvent(QEvent *event)
 {

diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index d477390..491ff27 100644 (file)
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -46,4 +46,4 @@ imagedirs               = images
 
 outputdir               = $QT_INSTALL_DOCS/qtdesigner
 
-depends                 += qtdoc qtwidgets qtcore
+depends                 += qtdoc qtwidgets qtcore qtuitools

diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc
index a93c906..b7582e1 100644 (file)
--- a/src/designer/src/designer/doc/src/designer-manual.qdoc
+++ b/src/designer/src/designer/doc/src/designer-manual.qdoc
@@ -1803,13 +1803,13 @@ pixmap property in the property editor.
     To use the direct approach, we include the \c ui_calculatorform.h file
     directly in \c main.cpp:
 
-    \snippet calculatorform/main.cpp 0
+    \snippet uitools/calculatorform/main.cpp 0
 
     The \c main function creates the calculator widget by constructing a
     standard QWidget that we use to host the user interface described by the
     \c calculatorform.ui file.
 
-    \snippet calculatorform/main.cpp 1
+    \snippet uitools/calculatorform/main.cpp 1
 
     In this case, the \c{Ui::CalculatorForm} is an interface description object
     from the \c ui_calculatorform.h file that sets up all the dialog's widgets