diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:01:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:01:03 +0100 |
| commit | 024de21b1d89a52aa90d47327e0b73969d063976 (patch) | |
| tree | 6a8a38ef2cbc9aea4a2de0155e6dcd9a06ac6d30 | |
| parent | 02705cfc21a3cb1f54feba3c4c251604f75f74ba (diff) | |
| parent | a38799f6e165e224750494bf515c78db4c4217db (diff) | |
| download | qtdoc-024de21b1d89a52aa90d47327e0b73969d063976.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iddaf3939f04ae46cccffa831dc354036663bdd93
| -rw-r--r-- | doc/images/qmlapp/qml-extending-types.gif | bin | 0 -> 377239 bytes | |||
| -rw-r--r-- | doc/src/qtmodules.qdoc | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/images/qmlapp/qml-extending-types.gif b/doc/images/qmlapp/qml-extending-types.gif Binary files differnew file mode 100644 index 00000000..86ccb478 --- /dev/null +++ b/doc/images/qmlapp/qml-extending-types.gif diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc index f477cf60..5f186970 100644 --- a/doc/src/qtmodules.qdoc +++ b/doc/src/qtmodules.qdoc @@ -209,11 +209,6 @@ \li \l{Qt for macOS}{\macos} \li Provides platform-specific APIs for \macos. \row - \li \l[QtNetworkAuth]{Qt Network Authorization} - \li All - \li All - \li Provides support for OAuth-based authorization to online services. - \row \li \l[QtNfc]{Qt NFC} \li All \li \l{Qt for Android}{Android} and \l{Qt for Linux/X11}{Linux} @@ -386,6 +381,11 @@ \li All \li UI Components for creating stunning 3D data visualizations. \row + \li \l[QtNetworkAuth]{Qt Network Authorization} + \li All + \li All + \li Provides support for OAuth-based authorization to online services. + \row \li \l{Qt Virtual Keyboard} \li All \li \l{Qt for Linux/X11}{Linux} and \l{Qt for Windows}{Windows} |
