qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Leena Miettinen 2019-09-19 13:24:43 +02:00
parent c1803d2668
commit d3ace86011
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bluetooth/doc/src/bluetooth-index.qdoc
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the documentation of the Qt Toolkit. ** 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 iOS}{iOS}
\li \l {Qt for Linux/X11}{Linux (BlueZ 4.x/5.x)} \li \l {Qt for Linux/X11}{Linux (BlueZ 4.x/5.x)}
\li \l \macos \li \l \macos
\li \l {Qt for WinRT}{WinRT} \li \l {Qt for UWP}{UWP (Universal Windows Platform)}
\li \l {Qt for Windows}{Win32} \li \l {Qt for Windows}{Win32}
\row \row
\li Classic Bluetooth \li Classic Bluetooth
@ -78,8 +78,8 @@ Currently, the API is supported on the following platforms:
\li \li
\endtable \endtable
Despite there not being a Win32 port yet, the WinRT backend is automatically used Despite there not being a Win32 port yet, the UWP backend is automatically used
if the win32 target platform supports the required WinRT APIs. Minimal requirement is Windows 10 version 1507 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 with slightly improved service discovery since Windows 10 version 1607. Therefore Windows 7 and 8.x
targets are excluded. targets are excluded.
@ -166,7 +166,8 @@ The \l QtBluetooth module exports the following
\li Enables logging of the QtBluetooth QML implementation \li Enables logging of the QtBluetooth QML implementation
\row \row
\li qt.bluetooth.winrt \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 \endtable
Logging categories can be used to enable additional warning and debug output Logging categories can be used to enable additional warning and debug output