summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-11 10:25:30 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-11 13:25:37 +0000
commita2ded9708842943f1fd301724f79f070c8e6ac8f (patch)
tree4f8b6c9d378057cb5b4e76c3ceb9a666b2df6f8c
parentb668e682de7089d062137d7b75078003d0f6e4bf (diff)
downloadqtdoc-a2ded9708842943f1fd301724f79f070c8e6ac8f.tar.gz
Fix some qdoc warnings.
qtdoc/doc/src/getting-started/controls-texteditor.qdoc:142: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:28: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:28: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:28: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:339: warning: Can't link to 'Qt Property System' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:339: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:339: warning: Can't link to 'Qt Quick Text Editor - Logic' qtdoc/doc/src/getting-started/controls-texteditor.qdoc:529: warning: Can't link to 'Qt Quick Controls Text Editor Example' qtdoc/doc/src/getting-started/gettingstartedqt.qdoc:28: warning: Can't link to 'QApplication::quit()' qtdoc/doc/src/howtos/accelerators.qdoc:28: warning: Can't link to 'QWidget::tr()' qtdoc/doc/src/howtos/scalabilityintro.qdoc:28: warning: Can't link to 'QtQuick::Item::rotation' qtdoc/doc/src/howtos/scalabilityintro.qdoc:28: warning: Can't link to 'QtQuick::Item::transform' qtdoc/doc/src/whatsnew/whatsnew51.qdoc:28: warning: Can't link to 'Q_GLOBAL_STATIC()' Change-Id: I11b1be601acdc74bb05fa96e433eb428a576eb8e Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/src/getting-started/controls-texteditor.qdoc16
-rw-r--r--doc/src/getting-started/gettingstartedqt.qdoc2
-rw-r--r--doc/src/howtos/accelerators.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew51.qdoc2
4 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/getting-started/controls-texteditor.qdoc b/doc/src/getting-started/controls-texteditor.qdoc
index b5a4d748..3a1580f1 100644
--- a/doc/src/getting-started/controls-texteditor.qdoc
+++ b/doc/src/getting-started/controls-texteditor.qdoc
@@ -59,7 +59,7 @@ the application.
The files are part of the Qt package and are available when searched for
\uicontrol{Qt Quick Text Editor} in Qt Creator's \uicontrol{Welcome mode}.
All files used in the application are listed for viewing in the
-\l{Qt Quick Controls Text Editor Example} page.
+\l{Qt Quick Controls - Text Editor Example} page.
\section1 Setting Up the Environment and Project
@@ -105,7 +105,7 @@ later in the guide:
The text editor uses several icons to represent various actions. The icons are
in the \e images directory which is directly under the \e TextEditor project
directory. The images as well as the project files are also listed in the
-reference documentation on the \l{Qt Quick Controls Text Editor Example} page.
+reference documentation on the \l{Qt Quick Controls - Text Editor Example} page.
We first need to register the image files into the project's resource file,
\e qml.qrc. The resource files compact the images into the binary packages.
@@ -134,7 +134,7 @@ binary. For more information about resource files, see the
The accompanying examples files are listed in the following page:
\list
-\li \l{Qt Quick Controls Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -331,7 +331,7 @@ QML type and \l{Signal and Handler Event System}.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -345,7 +345,7 @@ The accompanying examples files are found in the following page:
This part of the guide is about adding logic and backend to the
text editor example. At this stage, the user interface is
-set up from the \l{Qt Quick Text Editor - Logic}{previous} stage.
+set up from the \l{Qt Quick Text Editor Guide - Logic}{previous} stage.
\section1 Implementing the Logic and C++ Backend
@@ -374,7 +374,7 @@ The wizard creates a \uicontrol DocumentHandler class in two files,
There are two functionalities we can expose to QML, the file loading and
saving. We can do this by creating \e properties and binding them to C++
-functions through \l{Qt Property System}.
+functions through \l{Qt's Property System}.
In the \e documenthandler.h header file, add the following functions with their
respective access modifier:
@@ -521,7 +521,7 @@ these C++ functions in QML files.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -679,7 +679,7 @@ and QML file are already packaged into the binary file.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 4ff8536c..7ae37aef 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -441,7 +441,7 @@
The code defines the private function that is executed when QPushButton
emits the \l{QPushButton::}{clicked()} signal.
- We now complement the code to have the \l{QApplication::}{quit()} slot of
+ We now complement the code to have the \l{QCoreApplication::}{quit()} slot of
QApplication exit Notepad:
\snippet snippets/widgets-tutorial/notepad/notepad.cpp 1
diff --git a/doc/src/howtos/accelerators.qdoc b/doc/src/howtos/accelerators.qdoc
index 71879d46..d4adcc08 100644
--- a/doc/src/howtos/accelerators.qdoc
+++ b/doc/src/howtos/accelerators.qdoc
@@ -43,7 +43,7 @@
The emboldened letter plus Alt is Microsoft's recommended choice, and
we recommend supporting it. For an Apply button, for example, we
- recommend QAbstractButton::setText(\link QWidget::tr() tr \endlink("&Apply"));
+ recommend QAbstractButton::setText(\link QObject::tr() tr \endlink("&Apply"));
If you have conflicting commands (e.g. About and Apply buttons in the
same dialog), you must decide for yourself.
diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc
index 76950bbf..01102873 100644
--- a/doc/src/whatsnew/whatsnew51.qdoc
+++ b/doc/src/whatsnew/whatsnew51.qdoc
@@ -94,7 +94,7 @@
\li Added support for SHA3 to QCryptographicHash
\li Added toInt(), toUInt(), and similar functions to QStringRef
\li A new threadsafe initialization of global statics through refactored
- \l Q_GLOBAL_STATIC().
+ \l Q_GLOBAL_STATIC.
\li A new class, QLockFile, provides locking between processes using a
file. This lock enables applications to check that there is only one
instance of it running.