summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-09-19 13:24:43 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-09-23 10:01:14 +0200
commitd3ace86011d4e34eeafa795270ac027afd54f857 (patch)
tree41721159f5867bb06b302b390a4809cb677a5513
parentc1803d266854c6f71994705133e5b2b93a060d1e (diff)
Doc: Replace WinRT with UWP in Qt Bluetooth module docs
Task-number: QTBUG-61884 Change-Id: Idd8e3287f06f3f30102ae8e644dadec1eb8769f4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/bluetooth/doc/src/bluetooth-index.qdoc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index a0e2a048..08c57e40 100644
--- a/src/bluetooth/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 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.
@@ -42,7 +42,7 @@ Currently, the API is supported on the following platforms:
\li \l {Qt for iOS}{iOS}
\li \l {Qt for Linux/X11}{Linux (BlueZ 4.x/5.x)}
\li \l \macos
- \li \l {Qt for WinRT}{WinRT}
+ \li \l {Qt for UWP}{UWP (Universal Windows Platform)}
\li \l {Qt for Windows}{Win32}
\row
\li Classic Bluetooth
@@ -78,8 +78,8 @@ Currently, the API is supported on the following platforms:
\li
\endtable
-Despite there not being a Win32 port yet, the WinRT backend is automatically used
-if the win32 target platform supports the required WinRT APIs. Minimal requirement is Windows 10 version 1507
+Despite there not being a Win32 port yet, the UWP backend is automatically used
+if the win32 target platform supports the required UWP APIs. Minimal requirement is Windows 10 version 1507
with slightly improved service discovery since Windows 10 version 1607. Therefore Windows 7 and 8.x
targets are excluded.
@@ -166,7 +166,8 @@ The \l QtBluetooth module exports the following
\li Enables logging of the QtBluetooth QML implementation
\row
\li qt.bluetooth.winrt
- \li Enables logging of the \l {Qt for WinRT} {WinRT} implementation
+ \li Enables logging of the \l {Qt for UWP}{UWP (Universal Windows Platform)}
+ implementation
\endtable
Logging categories can be used to enable additional warning and debug output