Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: Icba6315772d2c31eb30f02460b2b282d12b33d37

7 files changed, 27 insertions, 11 deletions

diff --git a/.qmake.conf b/.qmake.conf
index aa9ded0..aefa1e7 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,3 @@
 load(qt_build_config)
-CONFIG += qt_example_installs
 
 MODULE_VERSION = 5.8.0
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b12..71c4ad4 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e18461..dfcab5e 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac..6bf924c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0
index 55ad36e..33dbb42 100644
--- a/dist/changes-5.7.0
+++ b/dist/changes-5.7.0
@@ -1,6 +1,7 @@
 Qt 5.7 introduces many new features and improvements as well as bugfixes
-over the 5.6.x series. For more details, refer to the online documentation
-included in this distribution. The documentation is also available online:
+over the 5.6.x series. Also, there is a change in the licensing terms.
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
 
   http://doc.qt.io/qt-5/index.html
 
@@ -16,6 +17,21 @@ Each of these identifiers can be entered in the bug tracker to obtain more
 information about a particular change.
 
 ****************************************************************************
+*                          Important License Changes                       *
+****************************************************************************
+
+  This module is no longer available under LGPLv2.1. The libraries are
+  now available under the following licenses:
+    * Commercial License
+    * GNU General Public License v2.0 (LICENSE.GPL2) and later
+    * GNU Lesser General Public License v3.0 (LICENSE.LGPL3)
+
+  The tools are now available under the following licenses:
+    * Commercial License
+    * GNU General Public License 3.0 (LICENSE.GPL3) with exceptions
+      described in The Qt Company GPL Exception 1.0 (LICENSE.GPL3-EXCEPT)
+
+****************************************************************************
 *                          Library                                         *
 ****************************************************************************
 
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h
index 23989e2..c7444d3 100644
--- a/src/activeqt/control/qaxfactory.h
+++ b/src/activeqt/control/qaxfactory.h
@@ -227,7 +227,7 @@ private:
     static QStringList getImplementedCategories()
     {
         const QMetaObject &mo = T::staticMetaObject;
-        QString catids = mo.classInfo(mo.indexOfClassInfo("Implemented Categories")).value();
+        QString catids = QLatin1String(mo.classInfo(mo.indexOfClassInfo("Implemented Categories")).value());
         return catids.split(QLatin1Char(','));
     }
 };
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 84b8768..145f248 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -414,7 +414,7 @@ void generateClassDecl(QTextStream &out, const QString &controlID, const QMetaOb
         if (slotSignature.endsWith("()")) { // no parameters - no names
             slotNamedSignature = slotSignature;
         } else {
-            slotNamedSignature.truncate(slotSignature.indexOf('(') + 1);
+            slotNamedSignature = slotSignature.left(slotSignature.indexOf('(') + 1);
             QByteArray slotSignatureTruncated(slotSignature.mid(slotNamedSignature.length()));
             slotSignatureTruncated.truncate(slotSignatureTruncated.length() - 1);
 
@@ -835,8 +835,9 @@ void generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
             if (property.isEditable())
                 flags |= Editable;
 
-            out << "0x" << QString::number(flags, 16).rightJustified(8, '0') << ", \t\t // " << property.typeName() << ' ' << property.name();
-            out << endl;
+            out << "0x" << QString::number(flags, 16).rightJustified(8, QLatin1Char('0'))
+                << ", \t\t // " << property.typeName() << ' ' << property.name()
+                << endl;
         }
         out << endl;
     }
@@ -1556,7 +1557,7 @@ int main(int argc, char **argv)
         QSettings settings(QLatin1String("HKEY_LOCAL_MACHINE\\Software\\Classes"), QSettings::NativeFormat);
 
         // regular string and not a file - must be ProgID
-        if (typeLib.at(0) != '{') {
+        if (typeLib.at(0) != QLatin1Char('{')) {
             CLSID clsid;
             if (CLSIDFromProgID(reinterpret_cast<const wchar_t *>(typeLib.utf16()), &clsid) != S_OK) {
                 qWarning("dumpcpp: '%s' is not a type library and not a registered ProgID",