Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2

 Conflicts:
	.qmake.conf

Change-Id: I4cde0b3e88dcfe741b4d1150f1f7b4e6a96e1430

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/src/qmlapp/deployment.qdoc b/doc/src/qmlapp/deployment.qdoc
index df2bb22c0..ee5def6c3 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