diff --git a/doc/images/creator-winrt-kits.png b/doc/images/creator-winrt-kits.png new file mode 100644 index 0000000000000000000000000000000000000000..071c348a584ba80a0004b520450383395482e54b Binary files /dev/null and b/doc/images/creator-winrt-kits.png differ diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index 60a957fda5df365ca2f8d3358e2756d9521d9337..88bbe70df46f873c2f943ef3a319015ca689e216 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -84,6 +84,12 @@ requires the BlackBerry NDK or the QNX SDK to be installed on the development PC. + \li \l{Connecting Windows Runtime 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. + \endlist */ diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc index 8adcb6d1181190b4dd2544fd472427a38c6ffcaa..afbadea5efd70cfad8a71705d4d9b4c9a4724537 100644 --- a/doc/src/overview/creator-target-platforms.qdocinc +++ b/doc/src/overview/creator-target-platforms.qdocinc @@ -16,6 +16,8 @@ \li QNX + \li Windows Runtime (including Windows Phone) + \endlist The following table summarizes operating system support for developing @@ -55,6 +57,11 @@ \li Yes \li Yes \li Yes (see \l{Running on QNX Devices} for limitations) + \row + \li Windows Runtime + \li No + \li No + \li Yes \endtable \note Symbian support has been removed from \QC 2.6. To develop for Symbian, diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index 6723189ef3b6008e2b4200287fa1746527f8ddae..2b315130989d5f7fae3c467f492a050d791cbf0a 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -24,7 +24,7 @@ /*! \contentspage index.html - \previouspage creator-developing-qnx.html + \previouspage creator-developing-winrt.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 e60dd60c41307c6663159917cb5ae4b8e36448ef..b05c929e00ecd9b489e88469ab4c23ffb950699c 100644 --- a/doc/src/qnx/creator-developing-qnx.qdoc +++ b/doc/src/qnx/creator-developing-qnx.qdoc @@ -22,7 +22,7 @@ \contentspage index.html \previouspage creator-developing-ios.html \page creator-developing-qnx.html - \nextpage creator-build-process-customizing.html + \nextpage creator-developing-winrt.html \title Connecting QNX Devices diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 107c32bb458b88539ea624c43ee75db61afda27b..e30f55810b1aa351fd86ad68e56260f19a171987 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -227,6 +227,7 @@ \li \l{Connecting Embedded Linux Devices} \li \l{Connecting iOS Devices} \li \l{Connecting QNX Devices} + \li \l{Connecting Windows Runtime Devices} \endlist \li \l{Customizing the Build Process} \endlist diff --git a/doc/src/winrt/creator-winrt.qdoc b/doc/src/winrt/creator-winrt.qdoc new file mode 100644 index 0000000000000000000000000000000000000000..08b223ded661689e5be13b4c3f2fa781d602bb0f --- /dev/null +++ b/doc/src/winrt/creator-winrt.qdoc @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (c) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator +** +** +** GNU Free Documentation License +** +** 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. +** +** +****************************************************************************/ + + /*! + + \contentspage index.html + \previouspage creator-developing-qnx.html + \page creator-developing-winrt.html + \nextpage creator-build-process-customizing.html + + \title Connecting Windows Runtime Devices + + You can build Windows Store Apps and run them on Windows Phones, Windows + Phone Emulator, or the Windows computer in Modern UI mode. + + \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. + + \image creator-winrt-kits.png "WinRT kits" + + To connect Windows Runtime devices: + + \list 1 + + \li Select \gui Help > \gui {About Plugins} > \gui {Device Support} > + \gui WinRT to enable the experimental Winows Runtime 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 \gui Projects > \gui {Build & Run} > \gui {Add Kit} to + add a kit for building and running applications on Windows + Runtime devices (the local computer, for now) Windows Phones, + or the Windows Phone emulator. + + \endlist + + \li Select \gui Run to specify run settings. + + Usually, you can use the default settings. + + \endlist + +*/