diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index a84df26f26e7a764b14be156b00b4ce6bcd8c445..54ef66be390b7a44459ddf51e22694d958da80e0 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.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 documentation of the Qt Toolkit. @@ -66,8 +66,8 @@ \list \li \l{Qt Creator: Building for Multiple Platforms}{Building for Multiple Platforms} \li \l{Qt Creator: Running on Multiple Platforms}{Running on Multiple Platforms} - \li \l{Qt Creator: Deploying to Mobile Devices}{Deploying to Mobile Devices} - \li \l{Qt Creator: Connecting Mobile Devices}{Connecting Mobile Devices} + \li \l{Qt Creator: Deploying to Devices}{Deploying to Devices} + \li \l{Qt Creator: Connecting Devices}{Connecting Devices} \endlist \list \li \l{Qt Creator: Building and Running}{See more} diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index d9a5efea2e1603468cba945c8f5c8ca7c278c2d6..c732da6779875063e2eac40b50afedc60dd3596b 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.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 documentation of the Qt Toolkit. @@ -129,8 +129,8 @@ \list \li \l{Qt Creator: Building for Multiple Platforms}{Building for Multiple Platforms} \li \l{Qt Creator: Running on Multiple Platforms}{Running on Multiple Platforms} - \li \l{Qt Creator: Deploying to Mobile Devices}{Deploying to Mobile Devices} - \li \l{Qt Creator: Connecting Mobile Devices}{Connecting Mobile Devices} + \li \l{Qt Creator: Deploying to Devices}{Deploying to Devices} + \li \l{Qt Creator: Connecting Devices}{Connecting Devices} \endlist \list \li \l{Qt Creator: Building and Running}{See more} diff --git a/doc/src/qmlapp/deployment.qdoc b/doc/src/qmlapp/deployment.qdoc index df2bb22c00ebf54ddea2902529acaad62e907901..ee5def6c396a209407e85bdce8de52743b674d85 100644 --- a/doc/src/qmlapp/deployment.qdoc +++ b/doc/src/qmlapp/deployment.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 documentation of the Qt Toolkit. @@ -46,13 +46,13 @@ a C++ application to load the QML runtime. \l{Qt Creator Manual}{Qt Creator} deploys and packages QML applications to various platforms. For mobile devices, Qt Creator can directly bundle -applications to the respective platform package formats such as APK and BAR. +applications to the respective platform package formats such as APK. For more information, visit: \list \li \l{Deploying Qt Applications} \li \l{Qt Creator: Running on Multiple Platforms}{Running on Multiple Platforms} -\li \l{Qt Creator: Deploying to Mobile Devices}{Deploying to Mobile Devices} +\li \l{Qt Creator: Deploying to Devices}{Deploying to Devices} \endlist When running applications on the target platform, the application needs to diff --git a/doc/src/whatsnew/whatsnew53.qdoc b/doc/src/whatsnew/whatsnew53.qdoc index 16883697190eb309e04d3f3489585e90b11cf0b2..90f56c2ec0a3b38bf5e3f5e9ef5dc04108158596 100644 --- a/doc/src/whatsnew/whatsnew53.qdoc +++ b/doc/src/whatsnew/whatsnew53.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 documentation of the Qt Toolkit. @@ -170,10 +170,6 @@ To enable the plugin, go to \gui Help > \gui{About Plugins} and enable \gui WinRT in \gui{Device Support}. - For more information, visit the - \l{Qt Creator: Connecting Windows Runtime Devices}{Connecting Windows Runtime Devices} - page. - \section2 Editors \list \li Better support of multiple editors and windows.