diff options
author | Nico Vertriest <nico.vertriest@digia.com> | 2014-12-23 14:43:55 +0100 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-01-15 14:06:33 +0100 |
commit | f2b0ed69b0ee1debd2d21164e235ffb881c479de (patch) | |
tree | 5b824181c8410a501961248199dd256503eef4f3 | |
parent | 6429da6efd2b5d95ea2c993251e1180e93d618e4 (diff) | |
download | qtdoc-f2b0ed69b0ee1debd2d21164e235ffb881c479de.tar.gz |
Doc: corrected link errors qtdoc
Change-Id: I557a2f7c71f98457f0c8a1a6c2a6e3a46f975e74
Task-number: QTBUG-43537
Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r-- | doc/snippets/qmlapp/usecases/styling.qml | 3 | ||||
-rw-r--r-- | doc/src/external-resources.qdoc | 2 | ||||
-rw-r--r-- | doc/src/internationalization/i18n.qdoc | 7 | ||||
-rw-r--r-- | doc/src/legal/3rdparty.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/android.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/platform-notes-android.qdoc | 2 | ||||
-rw-r--r-- | doc/src/qmlapp/glossary.qdoc | 10 | ||||
-rw-r--r-- | doc/src/qmlapp/usecases/layouts.qdoc | 2 | ||||
-rw-r--r-- | doc/src/qt5-intro.qdoc | 2 | ||||
-rw-r--r-- | doc/src/scripting.qdoc | 2 | ||||
-rw-r--r-- | doc/src/source-breaks.qdoc | 4 |
11 files changed, 18 insertions, 20 deletions
diff --git a/doc/snippets/qmlapp/usecases/styling.qml b/doc/snippets/qmlapp/usecases/styling.qml index 45ce780a..848c8df8 100644 --- a/doc/snippets/qmlapp/usecases/styling.qml +++ b/doc/snippets/qmlapp/usecases/styling.qml @@ -60,6 +60,7 @@ ApplicationWindow { GradientStop { position: 1 ; color: control.pressed ? "#000" : "#fff" } } } - } + } //![0] + } } diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 19878927..f0c832e4 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -57,7 +57,7 @@ /*! \externalpage http://www.gnu.org/licenses/gpl.html - \title GNU General Public License + \title GNU General Public License (GPL) */ /*! diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc index 6ab8185f..71a444d0 100644 --- a/doc/src/internationalization/i18n.qdoc +++ b/doc/src/internationalization/i18n.qdoc @@ -151,10 +151,9 @@ and Qt Quick's Text item). Support for these writing systems is transparent to the - programmer and completely encapsulated in \l{rich text - processing}{Qt's text engine}. This means that you don't need to - have any knowledge about the writing system used in a particular - language, except for the following small points: + programmer and completely encapsulated in \l{Rich Text Processing}{Qt's text engine}. + This means that you don't need to have any knowledge about the writing + system used in a particular language, except for the following small points: \list diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index b86d8556..78f8142a 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -468,7 +468,7 @@ and related or neighboring rights to the source code. http://creativecommons.org/publicdomain/zero/1.0/ - \section1 SQLite (sqlite) version 3.7.17.0 + \section1 SQLite (sqlite) version 3.8.5.0 \e{SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine.} diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index de85d027..ac0f0510 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -320,7 +320,7 @@ the APK: \note You must consider enabling/disabling the SSL features based on the legal restrictions in the region where your application is available. - See the \l{SSL Configure Options}{SSL configure options} for details about + See the \l{OpenSSL Configure Options}{SSL configure options} for details about the configurable features. \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc index 2a9a23d6..c6c6ce2b 100644 --- a/doc/src/platforms/platform-notes-android.qdoc +++ b/doc/src/platforms/platform-notes-android.qdoc @@ -164,7 +164,7 @@ you can use \c QPixmap("assets:/images/logo.png"). If using the assets mechanism is not required for your app, the recommended way of distributing - resources with your Qt app is to use \l{the Qt Resource System}, which is a cross-platform mechanism + resources with your Qt app is to use \l{The Qt Resource System}, which is a cross-platform mechanism for distributing resources with your app. \section1 Supported Architectures diff --git a/doc/src/qmlapp/glossary.qdoc b/doc/src/qmlapp/glossary.qdoc index 460493de..db82da19 100644 --- a/doc/src/qmlapp/glossary.qdoc +++ b/doc/src/qmlapp/glossary.qdoc @@ -56,12 +56,10 @@ The QML language provides a number of built in (\l{qtqml-typesystem-basictypes.html}{basic types}), and the - Qt Quick module provides various \l{qtquick-qmltypereference.html} - {Qt Quick types} for building QML applications. Types can also be - provided by third-party developers through - (\l{qtqml-modules-topic.html}{modules}) or by the application - developer in the application itself through - \l{qtqml-documents-definetypes.html}{QML Documents}. + Qt Quick module provides various \l {Qt Quick QML Types}{Qt Quick types} + for building QML applications. Types can also be provided by + third-party developers through (\l{qtqml-modules-topic.html}{modules}) or by the application + developer in the application itself through \l{qtqml-documents-definetypes.html}{QML Documents}. See \l{qtqml-typesystem-topic.html}{The QML Type System} for more details. diff --git a/doc/src/qmlapp/usecases/layouts.qdoc b/doc/src/qmlapp/usecases/layouts.qdoc index cd51b86f..dd50f87f 100644 --- a/doc/src/qmlapp/usecases/layouts.qdoc +++ b/doc/src/qmlapp/usecases/layouts.qdoc @@ -69,7 +69,7 @@ For the common case of wanting to \e position a set of types in a regular patter types. Items placed in a positioner are automatically positioned in some way; for example, a \l Row positions items to be horizontally adjacent (forming a row). -For full details see \l {Item Positioners} and the documentation for \l{qtquick-qmltypereference.html#positioning}{the positioner types}. +For full details see \l {Item Positioners} and the documentation for \l{Qt Positioning QML Types}{the positioner types}. \snippet qmlapp/usecases/layouts.qml import \snippet qmlapp/usecases/layouts.qml positioners diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc index ceb6d399..de8d9009 100644 --- a/doc/src/qt5-intro.qdoc +++ b/doc/src/qt5-intro.qdoc @@ -283,7 +283,7 @@ module interact with the Qt Cloud servers from Digia. \list - \li \l{Enginio Data Storage}{Qt Cloud Services} by Digia + \li \l{Qt Cloud Services} by Digia \li \l{Enginio Manual}{Enginio} - API for developers \endlist diff --git a/doc/src/scripting.qdoc b/doc/src/scripting.qdoc index c6f5a915..26e1fb60 100644 --- a/doc/src/scripting.qdoc +++ b/doc/src/scripting.qdoc @@ -53,5 +53,5 @@ This is a simple API, very similar to \l{Qt Script}, but limited to basic functi (\l{Use Case - Integrating JavaScript in QML}). All of these three scripting solutions seamlessly inter-operate with \l{The Meta-Object System}{the Meta-Object System}, which means that all \l{Signals & Slots}{signals and slots} and -\l{The property system}{properties} of a QObject instance are accessible in an \l{ECMAScript Reference}{ECMAScript} environment. +\l{The Property System}{properties} of a QObject instance are accessible in an \l{ECMAScript Reference}{ECMAScript} environment. */ diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc index c366cfc5..9fbd079d 100644 --- a/doc/src/source-breaks.qdoc +++ b/doc/src/source-breaks.qdoc @@ -721,7 +721,7 @@ recommendations for handling those changes. \li \c{QTest::qt_snprintf()} is removed. This was an internal test library function that was exposed in the public API due to its use in a public macro. Any calls to this function must be replaced with - \l{QByteArray::qsnprintf()}. + \l{qbytearray-qsnprintf()}{QByteArray::qsnprintf()}. \li c{QTest::pixmapsAreEqual()} is removed. Comparison of \l{QPixmap} objects must be done using the \c{QCOMPARE} macro, which provides more informative output in the event of a failure. \li The \c{"mode"} parameter in \c{QSKIP} macro is removed. This parameter caused problems @@ -791,7 +791,7 @@ recommendations for handling those changes. \li Configure no longer calls \c{qmake -recursive} by default, because the subsequent build invokes qmake as needed. Use \c{-fully-process} to restore the old behavior. - \li The \l lupdate \c CODECFORTR variable is deprecated, because source + \li The \l {Using lupdate}{lupdate} \c CODECFORTR variable is deprecated, because source code written with Qt 5 is expected to use UTF-8 encoding. \endlist |