From 64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:12 +0200 Subject: do not enable example installs explicitly any more it's done centrally now. Change-Id: Ie60ba6b42399c100745e8f5856749311bb30dde2 Reviewed-by: Joerg Bornemann --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 9665d29..c945d77 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.6.2 -- cgit v1.2.1 From 30e00535dd61c3328436e52a7c3367079551d6c8 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 19 May 2016 17:25:37 +0200 Subject: XsdElement: Initialize member m_isNillable As pointed out by Coverity (CID 22378). Change-Id: Ibeb06c49b8ead1925bc0377bcaef6109f7f8e53c Reviewed-by: Lars Knoll --- src/xmlpatterns/schema/qxsdelement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp index 3e11c29..29c069b 100644 --- a/src/xmlpatterns/schema/qxsdelement.cpp +++ b/src/xmlpatterns/schema/qxsdelement.cpp @@ -109,7 +109,7 @@ XsdAlternative::Ptr XsdElement::TypeTable::defaultTypeDefinition() const XsdElement::XsdElement() - : m_isAbstract(false) + : m_isAbstract(false), m_isNillable(false) { } -- cgit v1.2.1 From e8beed4a4491ce0d9d53bb82eb037211b29f58c1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 20 May 2016 16:16:16 +0200 Subject: Example MessageHandler: remove unused m_messageType. Coverity (CID 22275) pointed out it wasn't initialized in the constructor. It isn't even accessed; and the method that sets it claims the parameter it sets it to is unused. So just remove it. Change-Id: Id48f45a89b7a2d3d44e92b785d425592f1bc6467 Reviewed-by: Lars Knoll --- examples/xmlpatterns/schema/mainwindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/xmlpatterns/schema/mainwindow.cpp b/examples/xmlpatterns/schema/mainwindow.cpp index 512a76f..688ecf0 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; }; -- cgit v1.2.1 From 543fbe8f24ac9b534884d47787ee6cb3aad49150 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:39:24 +0800 Subject: Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Ibe92a94aa0812c01c99b16391605c30068225a83 Reviewed-by: Lars Knoll --- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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. -- cgit v1.2.1