diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index 0e06488c067..2b8d03b44e5 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -39,8 +39,9 @@ You can connect \l{glossary-device}{devices} to the development PC to run, debug, and analyze applications built for them from \QC. When you install Qt for a - target platform, such as Android or QNX, the build and run settings for the - development targets might be set up automatically in \QC. + target platform, such as Android, QNX, or Universal Windows Platform (UWP), + the build and run settings for the development targets might be set up + automatically in \QC. You can connect the device to the development PC using a USB connection. Additionally, you can connect Linux-based devices by using a WLAN @@ -82,13 +83,6 @@ supported for QNX Neutrino devices, and requires the QNX SDK to be installed on the development PC. - \li \l{Connecting UWP Devices} - - You can build applications for the Universal Windows Platform (UWP) - and run them on any Windows 10 devices, such as PC, tablet, or - phone. You can install the necessary tool chains as part of Qt 5.9 - or later. - \endlist */ diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index 456d056a9ea..a18e7b9daca 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -31,7 +31,7 @@ /*! \contentspage {Qt Creator Manual} - \previouspage creator-developing-uwp.html + \previouspage creator-developing-qnx.html \page creator-build-process-customizing.html \nextpage creator-testing.html diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc index ede33e87159..5eab609be8f 100644 --- a/doc/src/qnx/creator-developing-qnx.qdoc +++ b/doc/src/qnx/creator-developing-qnx.qdoc @@ -32,7 +32,7 @@ \contentspage {Qt Creator Manual} \previouspage creator-developing-ios.html \page creator-developing-qnx.html - \nextpage creator-developing-uwp.html + \nextpage creator-build-process-customizing.html \title Connecting QNX Devices diff --git a/doc/src/qtcreator-toc.qdoc b/doc/src/qtcreator-toc.qdoc index 56b58b78ab2..a4048aff8f6 100644 --- a/doc/src/qtcreator-toc.qdoc +++ b/doc/src/qtcreator-toc.qdoc @@ -156,7 +156,6 @@ \li \l{Connecting Embedded Linux Devices} \li \l{Connecting iOS Devices} \li \l{Connecting QNX Devices} - \li \l{Connecting UWP Devices} \endlist \li \l{Customizing the Build Process} \endlist diff --git a/doc/src/uwp/creator-uwp.qdoc b/doc/src/uwp/creator-uwp.qdoc deleted file mode 100644 index 0e10785a888..00000000000 --- a/doc/src/uwp/creator-uwp.qdoc +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Creator documentation. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** -****************************************************************************/ - - /*! - - \contentspage {Qt Creator Manual} - \previouspage creator-developing-qnx.html - \page creator-developing-uwp.html - \nextpage creator-build-process-customizing.html - - \title Connecting UWP Devices - - You can build applications for the Universal Windows Platform (UWP) and run - them on any Windows 10 devices, such as PC, tablet, or phone. - - \QC uses the integrated \c windeployqt and \c winrtrunner tools to deploy - and run applications. You can also run the tools manually from the command - line. - - Since 5.3, the Qt installers add the Windows Runtime and Windows Phone Qt - versions to \QC and create the necessary kits. In Qt 5.9, the packages were - renamed as UWP packages. - - \image creator-uwp-kits.png "UWP kits" - - To connect UWP devices: - - \list 1 - - \li Select \uicontrol Help > \uicontrol {About Plugins} > \uicontrol {Device Support} > - \uicontrol WinRT to enable the experimental UWP plugin. - - \li Restart \QC to be able to use the plugin. - - \li To specify build settings: - - \list 1 - - \li Open a project for an application you want to develop for the - device. - - \li Select \uicontrol Projects > \uicontrol {Build & Run} to - enable a kit for building applications and running them on UWP - devices. - - \endlist - - \li Select \uicontrol Run to specify run settings. - - Usually, you can use the default settings. - - \endlist - -*/