diff options
author | Nico Vertriest <nico.vertriest@qt.io> | 2019-02-08 16:29:45 +0100 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@qt.io> | 2019-03-01 12:47:40 +0000 |
commit | 22e2694da6d960e674d3931ca3b6d9ed2c1e48e1 (patch) | |
tree | a5d633fc171ec708e36c303a64a1730050918e43 | |
parent | b57745fd520dde5e727aae4bf06801d4b36ed8d1 (diff) |
Doc: Fix link and qdoc compilation errors in qtdocv5.13.0-beta1
Change-Id: I3d05fd5fd5c35648bbbf1e1521f52bc128dfcede
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-rw-r--r-- | doc/src/development/rcc.qdoc | 2 | ||||
-rw-r--r-- | doc/src/external-resources.qdoc | 2 | ||||
-rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 8 | ||||
-rw-r--r-- | doc/src/graphics.qdoc | 2 | ||||
-rw-r--r-- | doc/src/legal/licensechanges.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/qpa.qdoc | 2 | ||||
-rw-r--r-- | doc/src/platforms/webasm.qdoc | 4 | ||||
-rw-r--r-- | doc/src/qmlapp/applicationdevelopers.qdoc | 2 | ||||
-rw-r--r-- | doc/src/qt5-intro.qdoc | 4 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew51.qdoc | 2 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew510.qdoc | 2 | ||||
-rw-r--r-- | doc/src/whatsnew/whatsnew512.qdoc | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/doc/src/development/rcc.qdoc b/doc/src/development/rcc.qdoc index a9edb6397..7400d3e38 100644 --- a/doc/src/development/rcc.qdoc +++ b/doc/src/development/rcc.qdoc @@ -60,7 +60,7 @@ \row \li \c{-compress-algo} \li \c{algorithm} \li The algorithm to compress files with. Supported algorithms are \c{zstd}, \c{zlib}, and \c{none}, which respectively mean to compress the content using the - \l{Zstandard}{https://zstd.net} library, \l{zlib}{https://zlib.net} + \l{https://zstd.net}{Zstandard} library, \l{https://zlib.net}{zlib} library, and no compression. The default is \c{zstd} if that library was found at compile time, \c{zlib} if not. diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index a116d8e17..51a5bc1b8 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -359,6 +359,7 @@ /*! \externalpage http://blog.qt.io/blog/2018/05/22/qt-for-webassembly/ \title Qt and WebAssembly +*/ /*! \externalpage http://blog.qt.io/blog/2018/11/19/getting-started-qt-webassembly/ @@ -374,4 +375,3 @@ \externalpage https://webassembly.org \title WebAssembly Resource site */ - diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 28f57a8a1..da809a398 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -28,7 +28,7 @@ /*! \example tutorials/alarms \title Getting Started Programming with Qt Quick - \brief A tutorial for Qt Quick based on an alarms application + \brief A tutorial for Qt Quick based on an alarms application. This tutorial shows how to develop a simple alarm application as an introduction to Qt Quick and Qt Quick Controls2. @@ -161,7 +161,7 @@ \printto RoundButton New alarms can be added by clicking RoundButton \c addAlarmButton. - Clicking it opens a \l {Dialog: QtQuickControls2}{dialog} screen \c alarmDialog. + Clicking it opens a \l [QtQuickControls2] {Dialog} screen \c alarmDialog. \printuntil alarmDialog.open \printuntil alarmListView.model @@ -176,7 +176,7 @@ \quotefromfile tutorials/alarms/AlarmDialog.qml \skipto contentItem \printuntil /model\: years/ - \printuntil /^}/ + \printuntil /^\}/ If you click on \b OK in the dialog, the entered data will be added to \c alarmModel: @@ -267,7 +267,7 @@ When \c onClicked is emitted, the current ListElement is deleted from \c alarmModel. - \printuntil alarmModel.remove + \printuntil root.ListView.view.model.remove \printuntil } \section2 Summary diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc index 2f8d4d34c..9bf4955e8 100644 --- a/doc/src/graphics.qdoc +++ b/doc/src/graphics.qdoc @@ -121,7 +121,7 @@ OpenGL into their applications. \li \l {http://www.khronos.org/opengl}{www.khronos.org/opengl} - The official OpenGL pages. - \li \l[QtCanvas3D]{Qt Canvas 3D} - An add-on module that provides a way to + \li Qt Canvas 3D - An add-on module that provides a way to make OpenGL-like 3D drawing calls from Qt Quick using JavaScript. \endlist diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc index 650b8af16..b8fa0f7df 100644 --- a/doc/src/legal/licensechanges.qdoc +++ b/doc/src/legal/licensechanges.qdoc @@ -242,7 +242,7 @@ \li \l{Perfetto} got added under a \e{Apache 2} license. \li \e{The library to input, validate, and display addresses} got removed. - \li \l{content_shell_fonts} got added under + \li \e{content_shell_fonts} got added under \e{SIL OPEN FONT LICENSE, GPL v2, Bitstream Vera Fonts Copyright}. \li \e{libcxx} got removed. \li \e{libcxxabi} got removed. diff --git a/doc/src/platforms/qpa.qdoc b/doc/src/platforms/qpa.qdoc index 618328956..1d2aebeec 100644 --- a/doc/src/platforms/qpa.qdoc +++ b/doc/src/platforms/qpa.qdoc @@ -156,7 +156,7 @@ The following table summarizes the platform plugins available for QPA: \row \li \c qqnx \li QQnxIntegrationPlugin - \li \l{Platform and Compiler Notes - QNX}{QNX support} + \li \l{Qt for QNX}{QNX support} \row \li \c qvnc \li QVncIntegration diff --git a/doc/src/platforms/webasm.qdoc b/doc/src/platforms/webasm.qdoc index 6b46c653f..ef1b02047 100644 --- a/doc/src/platforms/webasm.qdoc +++ b/doc/src/platforms/webasm.qdoc @@ -44,7 +44,7 @@ resource usage. \section2 Install Emscripten -\l{emscripten} is a toolchain for compiling to asm.js and Webassembly. +\l {https://emscripten.org/docs/introducing_emscripten/index.html}{emscripten} is a toolchain for compiling to asm.js and Webassembly. It lets you run Qt on the web at near-native speed without plugins. Refer to the \l{http://kripken.github.io/emscripten-site/docs/getting_started/index.html}{emscripten documentation} for the installation procedure. @@ -98,7 +98,7 @@ This generates the following files: this typically reduces the size of the binary by 50 %. \sa {WebAssembly Resource site},{Getting Started with Qt for WebAssembly}, - {Remote UIs with WegGL and WebAssemblhy} + {Remote UIs with WeBGL and WebAssembly} \section1 Some examples \list diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc index 9edf0f45b..69d6f9fce 100644 --- a/doc/src/qmlapp/applicationdevelopers.qdoc +++ b/doc/src/qmlapp/applicationdevelopers.qdoc @@ -75,7 +75,7 @@ provided by Qt Quick, please see the \l{Qt Quick} module documentation. For creating or customizing graphical user interfaces, Qt Quick adds visual types, animation types, and other QML types in addition to the standard QML -types from Qt QML. \l{Qt Creator: Editing QLM Files in Design Mode}{Qt Quick Designer} +types from Qt QML. \l{Qt Creator: Editing QML Files in Design Mode}{Qt Quick Designer} is integrated within Qt Creator and supports \c{QtQuick 2} from Qt Creator version 2.7 and onwards. diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc index ca25a8192..325c210ad 100644 --- a/doc/src/qt5-intro.qdoc +++ b/doc/src/qt5-intro.qdoc @@ -227,14 +227,14 @@ \l{Qt Quick Controls 2} and \l{Qt Quick Layouts} modules are used. These modules provide ready-to-use UI controls and layouts to enable faster application development with less code. For a comparison of the two sets of - controls, see \l {Differences between Qt Quick Controls}. + controls, see \l {Differences with Qt Quick Controls 1}. \raw HTML <br> \endraw Qt Quick Controls and Qt Quick Layouts provide a vast set of UI controls ranging from the most basic text field and button to the more complex stack view and tumbler. The controls are also made available in - \l{Qt Creator: Editing QLM Files in Design Mode}{Qt Quick Designer}. + \l{Qt Creator: Editing QML Files in Design Mode}{Qt Quick Designer}. \raw HTML </td></tr> </table> diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc index 6125659cf..c1876b5e3 100644 --- a/doc/src/whatsnew/whatsnew51.qdoc +++ b/doc/src/whatsnew/whatsnew51.qdoc @@ -185,7 +185,7 @@ \list \li Improved C++11 code editing support - \li \l{Qt Creator: Editing QLM Files in Design Mode}{Qt Quick Designer} + \li \l{Qt Creator: Editing QML Files in Design Mode}{Qt Quick Designer} with full support for Qt Quick \li Android \l{Qt Creator: Deploying Applications to Android Devices}{development target} \li Experimental QBS and diff integration diff --git a/doc/src/whatsnew/whatsnew510.qdoc b/doc/src/whatsnew/whatsnew510.qdoc index 8cef78dd8..aabbc40ca 100644 --- a/doc/src/whatsnew/whatsnew510.qdoc +++ b/doc/src/whatsnew/whatsnew510.qdoc @@ -208,7 +208,7 @@ \list \li \l {Qt Remote Objects} (TP2) - Sharing QObject interfaces (signals, slots, and properties) between processes or devices. - \li \l {Qt WebGL Streaming Plugin} - Enables streaming Qt application + \li \l{Qt Quick WebGL}{Qt WebGL} Streaming Plugin - Enables streaming Qt application to a web browser over the network. \endlist diff --git a/doc/src/whatsnew/whatsnew512.qdoc b/doc/src/whatsnew/whatsnew512.qdoc index e8fc44cb3..3dd12a209 100644 --- a/doc/src/whatsnew/whatsnew512.qdoc +++ b/doc/src/whatsnew/whatsnew512.qdoc @@ -195,7 +195,7 @@ \section2 Qt Websockets Module \list - \li Added the \l {QWebsocket::bytesToWrite} function. + \li Added the \l {QWebSocket::bytesToWrite} function. \endlist \section2 Qt Location Module |