diff --git a/.qmake.conf b/.qmake.conf
index aa9ded07bfdf2f0514e717c0a6c9f92e974233eb..aefa1e701c27183c2dbc7ad59afd5717d0400281 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 4e49b122ae13285f9e398495ec04c1c786cddd63..71c4ad49c37f0fe26f7adbc9e43030c7cf0e32d2 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 6e1846112578dbd91bb78dcaf7a19ccdce899df5..dfcab5e29b761b2b88e9622fb7b7e0f0283bf76d 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 4d67bac0b46ccaad637e906c398aeb8bb6450437..6bf924cd155e442b89960693ca48a8d341c23174 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 55ad36e1a4b15c00ae718c8515d374988f10606e..33dbb42c7ad8ccb3da61f590cf66ae672b38ae3a 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
@@ -15,6 +16,21 @@ corresponding to tasks in the Qt Bug Tracker:
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 23989e2bd739d72f04aac98189233005e705755b..c7444d38be61e62d2b2e19076dd604f66770e755 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 84b876842ba938c69e1df0f016ffb109e4bd35a0..145f2489ffbe68fd0849b98b79f56fbedc52fe5c 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",