UWP: Replace WinRT with UWP where possible

It is still used in the name of the QPA plugin, the plugin class,
and runner tool.

Fixes: QTBUG-61884
Change-Id: I1ac154afbe59b590d65ed174a6598150ef2429b1
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

11 files changed, 60 insertions, 76 deletions

diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index a6517bbb7..6767e3e9a 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -225,7 +225,7 @@
     \list
     \li \l{Building Qt 5 for Android} Wiki page
     \li \l{Qt for iOS - Building from Source}
-    \li \l{Qt for WinRT#Building from source}{Qt for WinRT - Building from Source}
+    \li \l{Qt for UWP#Building from source}{Qt for UWP - Building from Source}
     \li \l{Configure an Embedded Linux Device}
     \li \l{http://wiki.qt.io/Qt_RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
     Raspberry devices
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index cffa9123d..0102f7113 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.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.
@@ -100,7 +100,7 @@
     \li \l{Qt for Windows}{Windows}
     \li \l{Qt for Linux/X11}{Linux/X11}
     \li \l{Qt for macOS}{\macos}
-    \li \l{Qt for WinRT}{Windows Runtime}
+    \li \l{Qt for UWP}{Universal Windows Platform}
     \endlist
 
     For more information, visit the \l{Supported Platforms}
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index cc57337c2..b5c236519 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.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.
@@ -93,9 +93,9 @@ visit the following page:
 \li \l {Qt for iOS - Building from Source}
 \endlist
 
-\section1 WinRT
+\section1 Universal Windows Platform (UWP)
 
 \list
-\li \l {Qt for WinRT#Building from source}{Qt for WinRT - Building from Source}
+\li \l {Qt for UWP#Building from source}{Qt for UWP - Building from Source}
 \endlist
 */
diff --git a/doc/src/platforms/qpa.qdoc b/doc/src/platforms/qpa.qdoc
index 3663ed4dd..7719ce949 100644
--- a/doc/src/platforms/qpa.qdoc
+++ b/doc/src/platforms/qpa.qdoc
@@ -182,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
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 7e05bd74e..28ff7548c 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -127,7 +127,7 @@
 \endtable
 //! [ios]
 
-\section2 \l{Qt for WinRT}{WinRT}
+\section2 \l{Qt for UWP}{Universal Windows Platform (UWP)}
 //! [winrt]
 \table 80%
     \header \li Platform Version \li Architecture \li Compiler \li Build Environment
@@ -140,7 +140,6 @@
 \br
 Universal Windows Platforms include Windows 10, Windows 10 IoT devices, Xbox
 One, and HoloLens.
-
 //! [winrt]
 
 //! [mobile]
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 98f480cfb..76bf4be7e 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.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.
@@ -597,7 +597,7 @@
     process of creating a deployable folder containing the \l{Qt}-related
     dependencies (libraries, QML imports, plugins, and translations) required
     to run the application from that folder.
-    It creates a sandbox for \l{Qt for WinRT}{Windows Runtime}
+    It creates a sandbox for \l{Qt for UWP}{Universal Windows Platform (UWP)}
     or an installation tree for Windows desktop applications, which can be
     easily bundled into an installation package.
 
diff --git a/doc/src/platforms/winrt.qdoc b/doc/src/platforms/winrt.qdoc
index 99264f7ad..fce050279 100644
--- a/doc/src/platforms/winrt.qdoc
+++ b/doc/src/platforms/winrt.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.
@@ -27,22 +27,24 @@
 
 /*!
     \page winrt_support.html
-    \title Qt for WinRT
-    \brief Provides insight into Qt's WinRT port and how to use it.
+    \title Qt for UWP
+    \brief Running Qt applications on devices supporting the
+    Universal Windows Platform (UWP).
     \ingroup supportedplatform
 
-    Qt for WinRT allows you to run Qt applications on devices supporting the
-    Windows Store App APIs. This covers Modern UI applications on Windows 10,
-    Windows 10 Mobile and Windows 10 IoT.
+    Qt for UWP allows you to run Qt applications on devices supporting the
+    Universal Windows Platform (UWP). Microsoft Windows 10 introduced UWP, which
+    provides a common application platform on every device that runs Windows 10,
+    as a successor to Windows Runtime (WinRT) introduced by Windows 8. The UWP
+    core APIs are the same on all Windows devices, and therefore applications
+    that only use the core APIs will run on any Windows 10 device, such as a
+    desktop PC, or Xbox One.
 
-    Microsoft introduced a new design paradigm with the Windows 8 Modern UI. A
-    core part of this new approach is Windows Runtime (WinRT) that supports
-    development using different programming languages, such as C++/CX (component
-    extensions), C# VB.NET, or JavaScript. The Qt port uses the C++
-    capabilities. While WinRT supports the component extensions internally, they
-    are not used inside Qt and you do not need to use them. WinRT applications
-    run in a sandboxed environment for security reasons and support different
-    architectures, such as ARM and x86.
+    The Qt port was originally written for WinRT and updated to support UWP. The
+    port uses the C++ capabilities. While UWP supports the component
+    extensions internally, they are not used inside Qt and you do not need to
+    use them. UWP applications run in a sandboxed environment for security
+    reasons and support different architectures, such as ARM and x86.
 
     \target winrt-supported-configurations
     \section1 Supported Configurations
@@ -53,45 +55,27 @@
 
     \section1 Requirements
 
-    Development for Windows Runtime requires a Microsoft Windows development host.
+    Development for UWP requires a Microsoft Windows development host.
     The minimum version supported is Windows 10.
 
-    Depending on your device target you will need the following tools provided
-    by Microsoft to be installed:
-
-    \table
-    \header
-        \li Device Target
-        \li Environment
-    \row
-        \li Windows 10 Mobile
-        \li Visual Studio 2015
-    \row
-        \li Windows 10 Desktop
-        \li Visual Studio 2015
-    \row
-        \li Windows 10 IoT
-        \li Visual Studio 2015
-    \row
-        \li XBox One
-        \li Visual Studio 2015
-    \endtable
-
-    If you are targeting a remote device, please follow all instructions by
+    Qt supports UWP apps running on any variant of Windows 10 or later on the
+    desktop PC, IoT, Xbox One, and so on.
+
+    If you are targeting a remote device, follow the instructions by
     Visual Studio to set it up correctly.
 
     \section1 Getting Started
 
     \section2 Notes to Desktop Users
 
-    As WinRT applications run in a sandboxed environment, some restrictions should be taken
+    As UWP applications run in a sandboxed environment, some restrictions should be taken
     into account when considering porting or writing cross-platform applications:
 
     \list
         \li The class QProcess is not implemented (indicated by the macro \c QT_NO_PROCESS
             being defined) as no subprocesses can be launched.
         \li Some paths returned by QStandardPaths::writableLocation() may be empty.
-        \li A WinRT application may not do socket-based communication with another application
+        \li A UWP application may not do socket-based communication with another application
             running on the same host (as this would violate the sandboxing).
         \li Applications run in fullscreen mode only (see QStyleHints). On desktop,
             the screen size varies as the application is resized.
@@ -99,18 +83,18 @@
             by maintaining the values locally, so that qputenv() and related
             functions continue to work. All known variables influencing Qt can
             be set in source code.
-        \li WinRT applications are UI applications by nature. This implies that
+        \li UWP applications are UI applications by nature. This implies that
             console type applications will have a window created internally,
             which is always visible.
         \li Applications should not exit programmatically. In particular, calling
             exit() before the UI is shown causes a crash.
-        \li The WinRT clipboard is local to the application; it cannot be retrieved
+        \li The UWP clipboard is local to the application; it cannot be retrieved
             by a desktop application.
     \endlist
 
     \section2 Building Applications
 
-    You can develop applications for WinRT just as any other Qt applications.
+    You can develop applications for UWP just as any other Qt applications.
     Use your favorite editor or IDE (such as Qt Creator) and create your
     application or load a Qt example. Then run \c qmake and \c {nmake/jom} to
     build your application.
@@ -147,7 +131,7 @@
     You will not need to do any conversion to open your project in Qt Creator.
     Please follow the generic instructions on how to open and build a project.
 
-    Qt Creator deploys your application on the WinRT device, if the
+    Qt Creator deploys your application on the UWP device, if the
     device is detected by the PC.
 
     \note Remote PCs, such as the Surface, are not yet supported for deployment by Creator.
@@ -159,30 +143,30 @@
     requirements for building Qt. The process of building Qt is found
     in the \l{Building Qt Sources} page.
 
-    Qt for WinRT is always built as a cross-build, because tools, such as qmake,
+    Qt for UWP is always built as a cross-build, because tools, such as qmake,
     are built as desktop applications. For compiling those, a desktop development
-    environment is required. If you have installed Visual Studio 2013 for Windows,
-    this will only create binaries for WinRT. You will need Visual Studio for
+    environment is required. If you have installed Visual Studio for Windows,
+    this will only create binaries for UWP. You will need Visual Studio for
     Windows Desktop as well to create those desktop tools.
 
     Please make sure to use an x86 command prompt (either use the \e {VS x86 Native
     Tools Command Prompt} or call \e vcvarsall.bat without any parameter or with \c x86)
-    for every WinRT build. While the toolchain which is used for the
+    for every UWP build. While the toolchain which is used for the
     target is set automatically, the command prompt decides what will be used for the
     host tools like \e qmake or \e moc. Building these tools might fail if another
     command prompt is used.
 
-    The WinRT mkspec format is \c {<platform>-<architecture>-<toolchain>}
+    The UWP mkspec format is \c {<platform>-<architecture>-<toolchain>}
     where architecture can be \c arm, \c x86, or \c x64. The following is an
-    example of building qtbase for WinRT:
+    example of building qtbase for UWP:
     \code
-        > ./configure -xplatform winrt-x64-msvc2013 -release
+        > ./configure -xplatform winrt-x64-msvc2017 -release
         > nmake/jom
     \endcode
 
     \section1 Running Applications from Command Line
 
-    WinRT applications must be packaged (including all dependencies) and
+    UWP applications must be packaged (including all dependencies) and
     installed or registered with the application service in order to be
     launched. \l{winrtrunner}{The WinRT Runner Tool} can be used to
     launch these applications from the command line.
@@ -196,7 +180,7 @@
     using a \c plugins folder as root. For more information, see
     \l{Qt for Windows - Deployment}.
 
-    As WinRT applications are run in a sandboxed environment, setting
+    As UWP applications are run in a sandboxed environment, setting
     the path variable to point to the files required will not work.
 
     The \l{The Windows Deployment Tool}{windeployqt} convenience tool looks up
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index d47ebce13..f5d9bb342 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.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.
@@ -61,14 +61,14 @@
      <table style="background:transparent; border: none">
       <tr><td style="width:50%; border: none; vertical-align: top">
     \endraw
-    Qt now comes with production-ready ports for Android, iOS, and WinRT.
+    Qt now comes with production-ready ports for Android and iOS.
     Extensive work has gone into these platform
     ports, which now extend Qt’s multi-platform promise to cover desktop,
     embedded, and mobile platforms.
     \raw HTML
      <br>
     \endraw
-    With full support for Android, iOS, and WinRT, Qt is a
+    With full support for Android and iOS, Qt is a
     great solution for targeting the mobile markets with a single codebase.
     It is fast and easy to bring existing desktop or embedded application
     to mobile, by simply recompiling it.
@@ -100,7 +100,6 @@
     \list
     \li \l{Qt for Android}
     \li \l{Qt for iOS}
-    \li \l{Qt for WinRT}
     \endlist
     \raw HTML
       </td><td style="width:50%; vertical-align:top; border: none">
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 9c10e872b..169055338 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -157,7 +157,7 @@
         \li All
         \li \l{Qt for Android}{Android},
             \l{Qt for iOS}{iOS}, \l{Qt for Linux/X11}{Linux}, \l{Qt for macOS}{\macos}, and
-            \l{Qt for WinRT}{WinRT} (*)
+            \l{Qt for UWP}{UWP} (*)
         \li Provides access to Bluetooth hardware.
     \row
         \li \l[QtConcurrent]{Qt Concurrent}
@@ -225,7 +225,7 @@
         \li \l[QtPositioning]{Qt Positioning}
         \li All
         \li \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, \l{Qt for macOS}{\macos},
-        \l{Qt for Linux/X11}{Linux}, \l{Qt for WinRT}{WinRT} (*).
+        \l{Qt for Linux/X11}{Linux}, \l{Qt for UWP}{UWP} (*).
         \li Provides access to position, satellite and area monitoring classes.
     \row
         \li \l[QtPrintSupport]{Qt Print Support}
@@ -281,7 +281,7 @@
     \row
         \li \l[QtSensors]{Qt Sensors}
         \li All
-        \li \l{Qt for Android}{Android}, \l{Qt for iOS}, \l{Qt for WinRT}{WinRT}, Mer,
+        \li \l{Qt for Android}{Android}, \l{Qt for iOS}, \l{Qt for UWP}{UWP}, Mer,
             and \l{Qt for QNX}{QNX}.
         \li Provides access to sensor hardware and motion gesture recognition.
     \row
diff --git a/doc/src/whatsnew/whatsnew53.qdoc b/doc/src/whatsnew/whatsnew53.qdoc
index e275861e0..c8cf7c46f 100644
--- a/doc/src/whatsnew/whatsnew53.qdoc
+++ b/doc/src/whatsnew/whatsnew53.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.
@@ -56,7 +56,6 @@
 
     \list
     \li Windows Runtime platforms: Windows 8/RT (Modern UI), Windows Phone 8.
-    The documentation is available at \l{Qt for WinRT}.
     \endlist
 
 
diff --git a/doc/src/whatsnew/whatsnew54.qdoc b/doc/src/whatsnew/whatsnew54.qdoc
index 0b0085f43..ab0622840 100644
--- a/doc/src/whatsnew/whatsnew54.qdoc
+++ b/doc/src/whatsnew/whatsnew54.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.
@@ -45,7 +45,7 @@
     \section1 New Supported Platforms
 
     \list
-    \li \l{Qt for WinRT}{WinRT} now a supported platform
+    \li Qt for \WinRT now a supported platform
     \li Windows Phone 8.1 minimum supported version
     \endlist
 
@@ -76,12 +76,12 @@
     color channel. If used as the internal format of a QOpenGLFramebufferObject,
     the OpenGL paint engine is able to render in full precision if supported by
     the OpenGL driver.
-    \li WinRT: Added support for native file dialogs.
+    \li \WinRT: Added support for native file dialogs.
     \endlist
 
     \section2 Qt Core Module
     \list
-    \li WinRT: Added support for native settings container (local and roaming).
+    \li \WinRT: Added support for native settings container (local and roaming).
     \li QStorageInfo: Class for providing information about currently mounted
     storage volumes and drives.
     \li QByteArrayList: Convenience class adding similar extra methods on top