Merge remote-tracking branch 'origin/5.6' into 5.75.7

Conflicts:
	doc/src/legal/licenses.qdoc

Change-Id: Id0fb35581b32d98cc9172a7eea6f6e2375cee1f0

11 files changed, 123 insertions, 89 deletions

diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 01c0e392a..666826936 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -47,49 +47,47 @@
 
     \section1 Source, Build, and Install Directories
 
-    With configure, it is possible to configure Qt to install to a different
-    directory than the source directory or the build directory. The \e source
-    directory contains the source code and it is obtained from the source
-    package. The \e build directory is where the build related files such as
-    Makefiles, object files, and other intermediate files are stored. The \e
-    install directory is where the binaries and libraries are installed, for use
-    either by the system or by the application.
-
-    It is often convenient to use a \e{shadow build}, when the build directory
-    is not the same as the source directory. This method allows the source
-    directory to be free from intermediate or generated files, and allows for
-    multiple simultaneous builds with different configurations. To shadow-build,
-    run \c configure from a separate directory:
-
-   \code
+    The \e source directory contains the source code that is obtained from
+    the source package or git repository. The \e build directory is where the
+    build-related files such as Makefiles, object files, and other intermediate
+    files are stored. The \e install directory is where the binaries and
+    libraries are installed, for use either by the system or by the
+    application.
+
+    It is recommended to keep these directories separate by shadow-building and
+    using the \c -prefix option. This enables you to keep the Qt \e source tree
+    clean from the build artifacts and binaries, which are stored in a separate
+    directory. This method is very convenient if you want to have multiple
+    builds from the same source tree, but for different configurations. To
+    shadow-build, run \c configure from a separate directory:
+
+    \badcode
     mkdir ~/qt-build
     cd ~/qt-build
-    ~/qt-source/configure
+    ~/qt-source/configure -prefix /opt/Qt5.6
+    qmake
     \endcode
 
-    The Makefiles are at \e ~/qt-build and not in the source directory.
+    Configuring with the \c -prefix option means that the Qt binaries and
+    libraries are installed into another directory, which is \c /opt/Qt5.6 in
+    this case. Running \c qmake generates the Makefiles in the \e ~/qt-build
+    directory and not in the \e source directory. After the Makefiles are in
+    place, run the following commands to build the Qt binaries and libraries,
+    and install them:
 
-    After building, it may be necessary to install the libraries and binaries
-    into the install directory. The default for the installation directory
-    depends on the platform; \c configure's output mentions it. To modify the
-    installation directory, use the \c -prefix option:
-
-    \code
-    ./configure -prefix /opt/Qt-5.1
+    \badcode
+    make
+    make install
     \endcode
 
-    The installation directory serves as the parent directory of the \e bin, \e
-    lib, and other installed Qt subdirectories.
-
-    It is possible to set the install directory to the same directory as the
-    build directory (this is termed a \e non-prefix build). In this case, Qt can
-    be used straight out of the build directory, and \e must \e not be
-    installed. This is the default under Windows, and when Qt is configured with
-    the \c -developer-build option.
+    \note The 'make install' step is required only if Qt is configured with a
+    \e -prefix, which is the default on Unix-based platforms unless the
+    \e -developer-build configure option is used. On Windows, Qt is configured
+    as a non-prefix build by default.
 
-    \note When you are explicitly requesting a non-prefix configuration for a
-    top-level build of Qt (all modules at once), set the prefix to
-    \c{$builddir/qtbase}, not \c{$builddir}.
+    \note The \c -developer-build is meant for developing Qt and not for
+    shipping applications. Such a build contains more exported symbols than
+    a standard build and compiles with a higher warning level.
 
     \section1 Including and Excluding Qt Modules
 
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index 4ba53d599..fb6ba5507 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -96,7 +96,7 @@
     \row \li \l{Qt Quick Compiler}
          \li A compiler for QML that enables building Qt Quick applications
          without having to deploy the QML sources on to the target.
-    \row \li \l{Qt Visual Studio Add-in}
+    \row \li \l{Qt VS Tools}
          \li Intended for developers who wish to develop Qt applications using
          the Visual Studio IDE instead of Qt Creator.
     \endtable
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index ea724043b..aa9f97121 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -70,6 +70,12 @@
     \title GNU Lesser General Public License, version 3
 */
 
+
+/*!
+    \externalpage https://spdx.org/licenses/BSD-3-Clause.html
+    \title BSD 3-clause "New" or "Revised" License
+*/
+
 /*!
     \externalpage http://qt-project.org/faq/answer/how_to_compress_data_with_qt
     \title How to compress data with Qt?
@@ -238,8 +244,8 @@
 */
 
 /*!
-    \externalpage http://doc.qt.io/vs-addin
-    \title Qt Visual Studio Add-in
+    \externalpage http://doc.qt.io/qtvstools/index.html
+    \title Qt VS Tools
 */
 /*!
     \externalpage http://doc.qt.io/emulator/index.html
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 14d0db073..cd6cedf16 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -168,6 +168,7 @@
             }
 
             MouseArea{
+                id: buttonMouseArea
                 onClicked: buttonClick()
                 hoverEnabled: true
                 onEntered: parent.border.color = onHoverColor
@@ -231,9 +232,9 @@
     \c FileMenu.qml.
 
     \code
-        import QtQuick 2.3             \\ Import the main Qt QML module
-        import "folderName"            \\ import the contents of a folder
-        import "script.js" as Script   \\ Import a Javascript file and name it as Script
+        import QtQuick 2.3             // Import the main Qt QML module
+        import "folderName"            // import the contents of a folder
+        import "script.js" as Script   // Import a Javascript file and name it as Script
     \endcode
 
     The syntax shown above shows how to use the \c import keyword. This is required to
@@ -366,14 +367,14 @@
     Additionally, \c ListView inherits from \l Flickable, making the list respond
     to mouse drags and other gestures. The last portion of the code above sets
     \c Flickable properties to create the desired flicking movement to our view.
-    In particular,the property \c highlightMoveDuration changes the duration of
+    In particular, the property \c highlightMoveDuration changes the duration of
     the flick transition. A higher \c highlightMoveDuration value results in
     slower menu switching.
 
     The \c ListView maintains the model items through an \c index and each visual
     item in the model is accessible through the \c index, in the order of the
     declaration. Changing the \c currentIndex effectively changes the highlighted
-    item in the \c ListView. The header of our menu bar exemplify this effect.
+    item in the \c ListView. The header of our menu bar exemplifies this effect.
     There are two buttons in a row, both changing the current menu when clicked.
     The \c fileButton changes the current menu to the file menu when clicked,
     the \c index being \c 0 because \c FileMenu is declared first in the
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index a3121b25e..dc1261a03 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -187,7 +187,10 @@
 
                 \endlist
 
-            It is recommended to use the \c Fusion style.
+            While the macOS style fully supports high-DPI, the Windows desktop style
+            currently has some limitations with certain scale factors. In these cases,
+            consider using the Fusion style instead, which aims to support high-DPI in
+            all cases.
 
             \note Non-integer scale factors may cause significant
             scaling/painting artifacts.
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 2159be833..f8ae37936 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -235,6 +235,48 @@
     See \c {qtbase/src/3rdparty/freebsd/strtoll.c} and
     \c {qtbase/src/3rdparty/freebsd/strtoull.c}
 
+    \section1 Google Type Traits
+
+    Changes to the original implementation:
+    \list
+    \li Move base types from template_util.h directly into qtypetraits.h
+    \li Use Qt macros for long long type differences on Windows.
+    \li Enclose in QtPrivate namespace.
+    \endlist
+
+    \badcode
+    Copyright (c) 2006, Google Inc.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with the
+    distribution.
+        * Neither the name of Google Inc. nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    \endcode
+
+    See \c {qtbase/src/corelib/global/qtypetraits.h}
+
     \section1 FreeType 2 (freetype) version 2.3.12
 
     \e{The FreeType project is a team of volunteers who develop free, portable
@@ -2181,21 +2223,6 @@
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     \hr
-    \section1 Drag and Drop
-
-    Copyright 1996 Daniel Dardailler.
-    Permission to use, copy, modify, distribute, and sell this software for any
-    purpose is hereby granted without fee, provided that the above copyright
-    notice appear in all copies and that both that copyright notice and this
-    permission notice appear in supporting documentation, and that the name of
-    Daniel Dardailler not be used in advertising or publicity pertaining to
-    distribution of the software without specific, written prior permission.
-    Daniel Dardailler makes no representations about the suitability of this
-    software for any purpose. It is provided "as is" without express or implied
-    warranty.
-    Modifications Copyright 1999 Matt Koss, under the same license as above.
-
-    \hr
     \section1 Valgrind:
 
     Copyright (C) 2000-2007 Julian Seward.  All rights reserved.
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index d167e2cf4..07f54a37b 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -34,7 +34,7 @@
     the needs of our various users:
 
     \list
-      \li Qt licensed under \e commercial licenses are appropriate for
+      \li Qt licensed under \e commercial licenses is appropriate for
           development of proprietary/commercial software where you do not want
           to share any source code with third parties or otherwise cannot
           comply with the terms of the GNU LGPL version 3.
@@ -87,8 +87,6 @@
     \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput(). \li Modified BSD \li
     \row \li \l{Contributions to the Cocoa Platform Plugin Files}{Cocoa Platform Plugin}
          \li Specific parts of the Qt for macOS Cocoa port. \li BSD-style \li \l{Qt for macOS}
-    \row \li \l{The qtmain Library}{qtmain library}
-         \li A helper library for writing a cross-platform main() function on Windows. \li Modified BSD \li \l{Qt for Windows}
     \row \li \l{Shift-JIS Text Codec}
          \li A character encoding for Japanese. \li BSD-style\li
     \row \li \l{ISO-2022-JP (JIS) Text Codec}
@@ -116,6 +114,9 @@
     \row \li \l{The PCRE library}
          \li The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.
          \li BSD-style \li
+    \row \li \l{Google Type Traits}
+         \li Custom implementation of templated type traits as defined by C++11.
+         \li BSD-style \li
 
     \row \li {4,1} \b{Third-party Licenses}
 
@@ -406,10 +407,6 @@
          \li The header is based on OpenKODE Core 1.0 specification.
          \li MIT License
 
-    \row \li \l{V8 double/string conversion library}
-         \li String conversion routines for IEEE doubles.
-         \li BSD-style \li
-
     \endtable
     \section1 Additional information
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 979833929..485385b7b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -38,25 +38,34 @@
     \page qtmain.html
     \title The qtmain Library
     \ingroup licensing
-    \brief Describes the use and license of the qtmain helper library.
+    \brief Commercial and \l{BSD 3-clause "New" or "Revised" License}.
 
     qtmain is a helper library that enables the developer to write a
     cross-platform main() function on Windows.
-    If you do not use \l qmake or other build tools such as \l{CMake Manual}{CMake}, then you
-    need to link against the \c qtmain library.
+    If you do not use \l qmake or other build tools such as
+    \l{CMake Manual}{CMake}, then you need to link against the
+    \c qtmain library.
 
-    \section1 License Information
+    The qtmain library is statically linked with the application.
+    To avoid issues with static linking and the
+    \l{GNU Lesser General Public License (LGPL)},
+    it is licensed both under the commercial licenses,
+    and the \l{BSD 3-clause "New" or "Revised" License}.
 
-    The QAxContainer module is not covered by the \l{GNU General Public License (GPL)},
-    the \l{GNU Lesser General Public License (LGPL)}, or the
-    \l{Qt Commercial License}. Instead, it is distributed under
-    the following license.
+    \section1 License Information
 
-    \legalese
-    Copyright (C) 2015 The Qt Company Ltd.\br
-    Contact: http://www.qt.io/licensing/
+    \badcode
+    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 The Qt Company. For licensing terms
+    and conditions see https://www.qt.io/terms-conditions. For further
+    information use the contact form at https://www.qt.io/contact-us.
 
-    You may use this file under the terms of the BSD license as follows:
+    BSD License Usage
+    Alternatively, you may use this file under the terms of the BSD license
+    as follows:
 
     "Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -83,5 +92,5 @@
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-    \endlegalese
+    \endcode
 */
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index dbb8545f2..88ab6b9bd 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -520,7 +520,7 @@
     \title Qt for Windows - Deployment
 
     This documentation describes deployment process for \l{Qt for
-    Windows}{Windows}. We refer to the \{Plug & Paint Example}{plug & paint}
+    Windows}{Windows}. We refer to the \l{Plug & Paint Example}{plug & paint}
     example application through out the document to demonstrate the deployment
     process.
 
diff --git a/doc/src/qmlapp/performance.qdoc b/doc/src/qmlapp/performance.qdoc
index db2e6967d..7e10b1239 100644
--- a/doc/src/qmlapp/performance.qdoc
+++ b/doc/src/qmlapp/performance.qdoc
@@ -828,6 +828,7 @@ interfaces to be rendered fluidly at 60 FPS. There are some things which can
 dramatically decrease rendering performance, however, and developers should be careful
 to avoid these pitfalls wherever possible.
 
+\target clipping-performance
 \section2 Clipping
 
 Clipping is disabled by default, and should only be enabled when required.
diff --git a/sync.profile b/sync.profile
index 736ba2713..6d035bc53 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,10 +1,2 @@
-# Module dependencies.
-# Every module that is required to build this module should have one entry.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
-#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
-#
-%dependencies = (
-    "qtbase" => "",
+%modules = ( # path to module name map
 );