3 files changed, 8 insertions, 12 deletions
diff --git a/examples/widgets/painting/composition/composition.cpp b/examples/widgets/painting/composition/composition.cpp
index 1c2802f860..d5d674fd83 100644
--- a/examples/widgets/painting/composition/composition.cpp
+++ b/examples/widgets/painting/composition/composition.cpp
@@ -290,7 +290,7 @@ void CompositionRenderer::updateCirclePos()
     if (m_current_object != NoObject)
         return;
     QDateTime dt = QDateTime::currentDateTime();
-    qreal t = (dt.toTime_t() * 1000 + dt.time().msec()) / 1000.0;
+    qreal t = dt.toMSecsSinceEpoch() / 1000.0;
 
     qreal x = width() / qreal(2) + (qCos(t*8/11) + qSin(-t)) * width() / qreal(4);
     qreal y = height() / qreal(2) + (qSin(t*6/7) + qCos(t * qreal(1.5))) * height() / qreal(4);
diff --git a/examples/widgets/painting/composition/composition.h b/examples/widgets/painting/composition/composition.h
index 015dd13098..49853f503b 100644
--- a/examples/widgets/painting/composition/composition.h
+++ b/examples/widgets/painting/composition/composition.h
@@ -118,21 +118,21 @@ class CompositionRenderer : public ArthurFrame
 public:
     CompositionRenderer(QWidget *parent);
 
-    void paint(QPainter *) Q_DECL_OVERRIDE;
+    void paint(QPainter *) override;
 
     void setCirclePos(const QPointF &pos);
 
-    QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(500, 400); }
+    QSize sizeHint() const override { return QSize(500, 400); }
 
     bool animationEnabled() const { return m_animation_enabled; }
     int circleColor() const { return m_circle_hue; }
     int circleAlpha() const { return m_circle_alpha; }
 
 protected:
-    void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE;
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *) override;
+    void mouseMoveEvent(QMouseEvent *) override;
+    void mouseReleaseEvent(QMouseEvent *) override;
+    void timerEvent(QTimerEvent *) override;
 
 public slots:
     void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear; update(); }
diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro
index 3b64714ba2..5fdbe4a5a2 100644
--- a/examples/widgets/painting/composition/composition.pro
+++ b/examples/widgets/painting/composition/composition.pro
@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += composition.qrc
-qtHaveModule(opengl): !contains(QT_CONFIG,dynamicgl) {
+qtHaveModule(opengl):!qtConfig(dynamicgl) {
     DEFINES += USE_OPENGL
     QT += opengl
 }
@@ -15,7 +15,3 @@ QT += widgets
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition
 INSTALLS += target
-
-wince* {
-    DEPLOYMENT_PLUGIN += qjpeg
-}