diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:50:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:50:45 +0200 |
commit | 574d92a43e1fc5480a7f5f79cc6baf566a53349f (patch) | |
tree | 727677d25d9f236b49cc0c4cd5766d6fcc365c40 | |
parent | 16c62550ca5a189f4610d3246d252060ab7be129 (diff) | |
parent | 543fbe8f24ac9b534884d47787ee6cb3aad49150 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I0b372947924113abfb00d77a655d71c43324ef99
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | LICENSE.GPLv3 | 2 | ||||
-rw-r--r-- | LICENSE.LGPLv21 | 2 | ||||
-rw-r--r-- | LICENSE.LGPLv3 | 2 | ||||
-rw-r--r-- | examples/xmlpatterns/schema/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/schema/qxsdelement.cpp | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index 3bc6c0a0..40e57878 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs CONFIG += warning_clean MODULE_VERSION = 5.7.0 diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b122..71c4ad49 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 6e184611..dfcab5e2 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 4d67bac0..6bf924cd 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/examples/xmlpatterns/schema/mainwindow.cpp b/examples/xmlpatterns/schema/mainwindow.cpp index 512a76fd..688ecf04 100644 --- a/examples/xmlpatterns/schema/mainwindow.cpp +++ b/examples/xmlpatterns/schema/mainwindow.cpp @@ -75,13 +75,11 @@ protected: Q_UNUSED(type); Q_UNUSED(identifier); - m_messageType = type; m_description = description; m_sourceLocation = sourceLocation; } private: - QtMsgType m_messageType; QString m_description; QSourceLocation m_sourceLocation; }; diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp index 769f1683..8a150fb5 100644 --- a/src/xmlpatterns/schema/qxsdelement.cpp +++ b/src/xmlpatterns/schema/qxsdelement.cpp @@ -115,7 +115,7 @@ XsdAlternative::Ptr XsdElement::TypeTable::defaultTypeDefinition() const XsdElement::XsdElement() - : m_isAbstract(false) + : m_isAbstract(false), m_isNillable(false) { } |