From 600ae02bce34b5cd56c1ddc99553bf661ae96b1a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:08 +0200 Subject: do not enable example installs explicitly any more it's done centrally now. Change-Id: I457d86a8815aa7ab7275515c692c457ac6f4177e 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 415572bb872af5d30943ab396d1f89de918ca54b Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 20 May 2016 13:57:59 +0200 Subject: QSvgAnimate{Color,Transform}: initialize all members. Coverity (CIDs 22640, 22316) complained that some members weren't initialized. Although setters are provided for these members, we have no guarantee that they're called, so initialize to sensible values. Chose indefinite repeat (repeat count -1) rather than single-shot. In the process, discovered each class's m_to was used only in the constructor (my initial change removed even this use, leading to a compiler warning, as error, on OSX); so removed from both classes. Change-Id: Ibb88a6190f2d740f57c67c1d5ee8a7b03129c510 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/svg/qsvgstyle.cpp | 21 +++++++++++++++------ src/svg/qsvgstyle_p.h | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index e3fc79f..3cf88e0 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -629,10 +629,16 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states) QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs ) : QSvgStyleProperty(), - m_from(startMs), m_to(endMs), - m_type(Empty), m_additive(Replace), m_count(0), m_finished(false), m_transformApplied(false) + m_from(startMs), + m_totalRunningTime(endMs - startMs), + m_type(Empty), + m_additive(Replace), + m_count(0), + m_finished(false), + m_freeze(false), + m_repeatCount(-1.), + m_transformApplied(false) { - m_totalRunningTime = m_to - m_from; Q_UNUSED(byMs); } @@ -801,10 +807,13 @@ void QSvgAnimateTransform::setRepeatCount(qreal repeatCount) QSvgAnimateColor::QSvgAnimateColor(int startMs, int endMs, int byMs) : QSvgStyleProperty(), - m_from(startMs), m_to(endMs), - m_finished(false) + m_from(startMs), + m_totalRunningTime(endMs - startMs), + m_fill(false), + m_finished(false), + m_freeze(false), + m_repeatCount(-1.) { - m_totalRunningTime = m_to - m_from; Q_UNUSED(byMs); } diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 53b9871..1c9537f 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -680,7 +680,7 @@ public: protected: void resolveMatrix(const QSvgNode *node); private: - qreal m_from, m_to; + qreal m_from; qreal m_totalRunningTime; TransformType m_type; Additive m_additive; @@ -706,7 +706,7 @@ public: virtual void revert(QPainter *p, QSvgExtraStates &states); virtual Type type() const; private: - qreal m_from, m_to; + qreal m_from; qreal m_totalRunningTime; QList m_colors; QBrush m_oldBrush; -- cgit v1.2.1 From da117cdd5a602ad6c77a41699fbea6f685f62931 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:38:46 +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: I9f35d9b9c1ca8b6e5d41ef97df6974842ef0d767 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 From 2d55b4996eaa26c973afdf15f6f703c0a1840a96 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sat, 9 Jul 2016 15:39:52 +0300 Subject: Allow running qicon_svg test against local qtsvg build When the build is local (i.e. not system-wide installed), libQt5Svg.so.5 needs to be on LD_LIBRARY_PATH, otherwise the plugin will not be able to load it. LD_LIBRARY_PATH is set by target_wrapper.sh, generated by qmake, which will add local lib directory there only if QT contains svg. This is a workaround for the dependency resolution of plugins and modules not being properly integrated. Change-Id: I68c3bc850367af62e7ccaa766fa83453fa0d8621 Reviewed-by: Oswald Buddenhagen --- tests/auto/qicon_svg/qicon_svg.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro index 643717c..b7f4832 100644 --- a/tests/auto/qicon_svg/qicon_svg.pro +++ b/tests/auto/qicon_svg/qicon_svg.pro @@ -1,12 +1,11 @@ CONFIG += testcase TARGET = tst_qicon_svg -QT += testlib gui-private +QT += svg testlib gui-private SOURCES += tst_qicon_svg.cpp RESOURCES = tst_qicon_svg.qrc wince* { - QT += svg DEPLOYMENT_PLUGIN += qsvg } TESTDATA += icons/* -- cgit v1.2.1