diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:04:12 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:04:19 +0200 |
| commit | cdcda09055c35b8faf08588a4bba5369571ce3c5 (patch) | |
| tree | 1292f72bfeb5fc0bd79d1a4acac2de9f380632df /doc/src/platforms/qpa.qdoc | |
| parent | b490a2028f4c03783e76646bf9ff47e3601bf14d (diff) | |
| parent | 20948b62f69338cb5ba6b396ae5cf8c32bf348b6 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1
Diffstat (limited to 'doc/src/platforms/qpa.qdoc')
| -rw-r--r-- | doc/src/platforms/qpa.qdoc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/src/platforms/qpa.qdoc b/doc/src/platforms/qpa.qdoc index 1abedebe7..7719ce949 100644 --- a/doc/src/platforms/qpa.qdoc +++ b/doc/src/platforms/qpa.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -162,6 +162,10 @@ The following table summarizes the platform plugins available for QPA: \li QVncIntegration \li VNC support \row + \li \c qwasm + \li QWasmIntegration + \li \l{Qt for WebAssembly}{WebAssembly support} +\row \li \c qwayland \li \list \li QWaylandIntegrationPlugin @@ -178,7 +182,10 @@ The following table summarizes the platform plugins available for QPA: \row \li \c qwinrt \li QWinRTIntegrationPlugin - \li \l{Qt for WinRT}{WinRT and Windows Phone support} + \li \l{Qt for UWP}{Universal Windows Platform (UWP) support} + \note This plugin was originally written for \WinRT (Windows Runtime), + and is therefore called \c qwinrt. + \row \li \c qxcb \li QXcbIntegrationPlugin |