Doc: Windows Runtime renamed as UWP

To reflect the change in Qt installers since 5.9.

Change-Id: I685c32c168e95e76ae3d81b87d4d10a5092e7a8a
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>

7 files changed, 22 insertions, 21 deletions

diff --git a/doc/images/creator-uwp-kits.png b/doc/images/creator-uwp-kits.png
new file mode 100644
index 0000000000..2c8c29560d
--- /dev/null
+++ b/doc/images/creator-uwp-kits.png
diff --git a/doc/images/creator-winrt-kits.png b/doc/images/creator-winrt-kits.png
deleted file mode 100644
index 071c348a58..0000000000
--- a/doc/images/creator-winrt-kits.png
+++ /dev/null
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index a0ea95905d..680a9afd88 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -82,11 +82,12 @@
             supported for QNX Neutrino devices, and requires the QNX SDK to be
             installed on the development PC.
 
-        \li \l{Connecting Windows Runtime Devices}
+        \li \l{Connecting UWP Devices}
 
-            You can build Windows Store Apps and run them on Windows Phones, the
-            Windows Phone Emulator, or the Windows computer in Modern UI mode.
-            You can install the necessary tool chains as part of Qt 5.3.
+            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 c006d586f2..456d056a9e 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-winrt.html
+    \previouspage creator-developing-uwp.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 a42ba9932c..ede33e8715 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-winrt.html
+    \nextpage creator-developing-uwp.html
 
     \title Connecting QNX Devices
 
diff --git a/doc/src/qtcreator-toc.qdoc b/doc/src/qtcreator-toc.qdoc
index 6329e57a3e..43fa9829b1 100644
--- a/doc/src/qtcreator-toc.qdoc
+++ b/doc/src/qtcreator-toc.qdoc
@@ -156,7 +156,7 @@
                 \li \l{Connecting Embedded Linux Devices}
                 \li \l{Connecting iOS Devices}
                 \li \l{Connecting QNX Devices}
-                \li \l{Connecting Windows Runtime Devices}
+                \li \l{Connecting UWP Devices}
             \endlist
             \li \l{Customizing the Build Process}
         \endlist
diff --git a/doc/src/winrt/creator-winrt.qdoc b/doc/src/uwp/creator-uwp.qdoc
index a4b0a7181c..0e10785a88 100644
--- a/doc/src/winrt/creator-winrt.qdoc
+++ b/doc/src/uwp/creator-uwp.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -27,29 +27,30 @@
 
     \contentspage {Qt Creator Manual}
     \previouspage creator-developing-qnx.html
-    \page creator-developing-winrt.html
+    \page creator-developing-uwp.html
     \nextpage creator-build-process-customizing.html
 
-    \title Connecting Windows Runtime Devices
+    \title Connecting UWP Devices
 
-    You can build Windows Store Apps and run them on Windows Phones, Windows
-    Phone Emulator, or the Windows computer in Modern UI mode.
+    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.
 
-    The Qt 5.3 installer adds Windows Runtime and Windows Phone Qt versions to
-    \QC and creates the necessary kits.
+    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-winrt-kits.png "WinRT kits"
+    \image creator-uwp-kits.png "UWP kits"
 
-    To connect Windows Runtime devices:
+    To connect UWP devices:
 
     \list 1
 
         \li Select \uicontrol Help > \uicontrol {About Plugins} > \uicontrol {Device Support} >
-            \uicontrol WinRT to enable the experimental Windows Runtime plugin.
+            \uicontrol WinRT to enable the experimental UWP plugin.
 
         \li Restart \QC to be able to use the plugin.
 
@@ -61,9 +62,8 @@
                 device.
 
             \li Select \uicontrol Projects > \uicontrol {Build & Run} to
-                enable a kit for building applications and running them on Windows
-                Runtime devices (the local computer, for now), Windows Phones,
-                or the Windows Phone emulator.
+                enable a kit for building applications and running them on UWP
+                devices.
 
         \endlist