Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af

2 files changed, 8 insertions, 95 deletions

diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc
deleted file mode 100644
index 53ab94091e..0000000000
--- a/doc/global/externalsites/qch-urls.qdoc
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** 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.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \externalpage http://doc.qt.digia.com/qtcreator/creator-qml-application.html
-    \title external: Developing Qt Quick Applications with Creator
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtcreator/creator-visual-editor.html
-    \title external: Developing Qt Quick Applications
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtcreator/creator-publish-ovi.html
-    \title external: Publishing Applications to Ovi Store
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator
-    \title external: Qt Creator Manual
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtmobility/index.html
-    \title external: Qt Mobility Manual
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtmobility/qml-plugins.html
-    \title external: Qt Mobility QML Plugins
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html
-    \title external: Creating Qt Projects in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-building-running.html
-    \title external: Building and Running Applications in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html
-    \title external: Set Compiler Targets in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html
-    \title external: Build Settings in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html
-    \title external: Run Settings in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html
-    \title external: Designer in Creator
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-debugging.html
-    \title external: Debugging Applications in Creator
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtmobility/multimedia.html
-    \title external: Mobility Multimedia
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtmobility/location-overview.html
-    \title external: Mobility Location
-*/
-/*!
-    \externalpage http://doc.qt.digia.com/qtmobility/all-examples.html
-    \title external: Qt Mobility Examples
-*/
-/*!
-    \externalpage http://doc.qt.io/qtcreator/creator-overview.html
-    \title external: Qt Creator Overview
-*/
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index c2eed07c6d..c96920a689 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -392,6 +392,14 @@
     \title Qt Creator: Adding New Custom Wizards
 */
 /*!
+    \externalpage http://doc.qt.io/qtcreator/creator-project-wizards-json.html
+    \title Qt Creator: Adding JSON-Based Wizards
+*/
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-project-wizards-xml.html
+    \title Qt Creator: Adding XML-Based Wizards
+*/
+/*!
     \externalpage http://doc.qt.io/qtcreator/creator-projects-autotools.html
     \title Qt Creator: Setting Up an Autotools Project
 */