summaryrefslogtreecommitdiff
path: root/examples/svg/embedded
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-05-27 20:22:17 +0200
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-05-27 20:22:17 +0200
commit357a5bd4d6682a50d85c88ba485ed34c745fae85 (patch)
tree5853bfa57606e7ceaaef931b228f0493bec2cfac /examples/svg/embedded
parenta21cf52e101ad50c330ad0b42416cc83318afea7 (diff)
downloadqtsvg-357a5bd4d6682a50d85c88ba485ed34c745fae85.tar.gz
QtSvg: remove deprecated functions and enumerations
Replace QPainter::HighQualityAntialiasing with Antialiasing and remove defines needed for Qt4. Change-Id: I866decad7d9c10da15e5b0e0bd79033d574f6a08 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'examples/svg/embedded')
-rw-r--r--examples/svg/embedded/desktopservices/contenttab.cpp1
-rw-r--r--examples/svg/embedded/weatherinfo/weatherinfo.cpp4
2 files changed, 1 insertions, 4 deletions
diff --git a/examples/svg/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp
index 8d467df..2dac351 100644
--- a/examples/svg/embedded/desktopservices/contenttab.cpp
+++ b/examples/svg/embedded/desktopservices/contenttab.cpp
@@ -124,6 +124,7 @@ void ContentTab::keyPressEvent(QKeyEvent *event)
switch (event->key()) {
case Qt::Key_Select:
openItem(currentItem());
+ Q_FALLTHROUGH();
default:
QListWidget::keyPressEvent(event);
break;
diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.cpp b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
index b64d8ca..21aa986 100644
--- a/examples/svg/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
@@ -147,17 +147,13 @@ private slots:
void animate(int frame) {
qreal progress = static_cast<qreal>(frame) / 100;
-#if QT_VERSION >= 0x040500
m_iconItem->setOpacity(progress);
-#endif
qreal hw = width() / 2.0;
m_statusItem->setPos(-hw + hw * progress, 0);
for (int i = 0; i < m_forecastItems.count(); ++i) {
qreal ofs = i * 0.5 / m_forecastItems.count();
qreal alpha = qBound(qreal(0), 2 * (progress - ofs), qreal(1));
-#if QT_VERSION >= 0x040500
m_conditionItems[i]->setOpacity(alpha);
-#endif
QPointF pos = m_forecastItems[i]->pos();
if (width() > height()) {
qreal fx = width() - width() * 0.4 * alpha;