diff options
Diffstat (limited to 'examples/svg/embedded')
-rw-r--r-- | examples/svg/embedded/desktopservices/contenttab.cpp | 1 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/pictureflow.cpp | 6 | ||||
-rw-r--r-- | examples/svg/embedded/weatherinfo/weatherinfo.cpp | 4 |
3 files changed, 4 insertions, 7 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/fluidlauncher/pictureflow.cpp b/examples/svg/embedded/fluidlauncher/pictureflow.cpp index 191ff2e..b0657a2 100644 --- a/examples/svg/embedded/fluidlauncher/pictureflow.cpp +++ b/examples/svg/embedded/fluidlauncher/pictureflow.cpp @@ -85,7 +85,7 @@ #include <QTimer> #include <QVector> #include <QWidget> -#include <QTime> +#include <QElapsedTimer> #include <QDebug> @@ -376,7 +376,7 @@ public: int singlePressThreshold; QPoint firstPress; QPoint previousPos; - QTime previousPosTimestamp; + QElapsedTimer previousPosTimestamp; int pixelDistanceMoved; int pixelsToMovePerSlide; @@ -1397,7 +1397,7 @@ void PictureFlow::timerEvent(QTimerEvent* event) { if(event->timerId() == d->animateTimer.timerId()) { -// QTime now = QTime::currentTime(); +// QElapsedTimer now; now.start(); d->updateAnimation(); // d->animateTimer.start(qMax(0, 30-now.elapsed() ), this); } 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; |