From 48f7e029923303fc313ca460a1a7d06fc2d04384 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Fri, 18 Aug 2017 16:58:32 +0200
Subject: [PATCH] Fix links to Qt Creator Manual
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ia719dd9ec2bddf162f3a174b02dba0a422e7bb70
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
doc/src/examples.qdoc | 6 +++---
doc/src/getting-started/gettingstarted.qdoc | 6 +++---
doc/src/qmlapp/deployment.qdoc | 6 +++---
doc/src/whatsnew/whatsnew53.qdoc | 6 +-----
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index a84df26f..54ef66be 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 d9a5efea..c732da67 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 df2bb22c..ee5def6c 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 16883697..90f56c2e 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.
--
GitLab