1 files changed, 6 insertions, 68 deletions

diff --git a/examples/widgets/painting/deform/pathdeform.cpp b/examples/widgets/painting/deform/pathdeform.cpp
index fead0e3c13..f2c67c1587 100644
--- a/examples/widgets/painting/deform/pathdeform.cpp
+++ b/examples/widgets/painting/deform/pathdeform.cpp
@@ -61,13 +61,6 @@ void PathDeformControls::layoutForDesktop()
     QPushButton *showSourceButton = new QPushButton(mainGroup);
     showSourceButton->setText(tr("Show Source"));
 
-#if QT_CONFIG(opengl)
-    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
-    enableOpenGLButton->setText(tr("Use OpenGL"));
-    enableOpenGLButton->setCheckable(true);
-    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
-#endif
-
     QPushButton *whatsThisButton = new QPushButton(mainGroup);
     whatsThisButton->setText(tr("What's This?"));
     whatsThisButton->setCheckable(true);
@@ -82,9 +75,6 @@ void PathDeformControls::layoutForDesktop()
     mainGroupLayout->addWidget(textGroup);
     mainGroupLayout->addWidget(animateButton);
     mainGroupLayout->addStretch(1);
-#if QT_CONFIG(opengl)
-    mainGroupLayout->addWidget(enableOpenGLButton);
-#endif
     mainGroupLayout->addWidget(showSourceButton);
     mainGroupLayout->addWidget(whatsThisButton);
 
@@ -108,9 +98,6 @@ void PathDeformControls::layoutForDesktop()
     connect(deformSlider, &QAbstractSlider::valueChanged, m_renderer, &PathDeformRenderer::setIntensity);
     connect(fontSizeSlider, &QAbstractSlider::valueChanged, m_renderer, &PathDeformRenderer::setFontSize);
     connect(animateButton, &QAbstractButton::clicked, m_renderer, &PathDeformRenderer::setAnimated);
-#if QT_CONFIG(opengl)
-    connect(enableOpenGLButton, &QAbstractButton::clicked, m_renderer, &ArthurFrame::enableOpenGL);
-#endif
 
     connect(textInput, &QLineEdit::textChanged, m_renderer, &PathDeformRenderer::setText);
     connect(m_renderer, &ArthurFrame::descriptionEnabledChanged,
@@ -151,13 +138,6 @@ void PathDeformControls::layoutForSmallScreen()
     QPushButton *animateButton = new QPushButton(tr("Animated"), mainGroup);
     animateButton->setCheckable(true);
 
-#if QT_CONFIG(opengl)
-    QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
-    enableOpenGLButton->setText(tr("Use OpenGL"));
-    enableOpenGLButton->setCheckable(mainGroup);
-    enableOpenGLButton->setChecked(m_renderer->usesOpenGL());
-#endif
-
     QPushButton *quitButton = new QPushButton(tr("Quit"), mainGroup);
     QPushButton *okButton = new QPushButton(tr("OK"), mainGroup);
 
@@ -171,9 +151,6 @@ void PathDeformControls::layoutForSmallScreen()
     mainGroupLayout->addWidget(fontSizeLabel, 2, 0, Qt::AlignRight);
     mainGroupLayout->addWidget(fontSizeSlider, 2, 1);
     mainGroupLayout->addWidget(animateButton, 3,0, 1,2);
-#if QT_CONFIG(opengl)
-    mainGroupLayout->addWidget(enableOpenGLButton, 4,0, 1,2);
-#endif
 
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(mainGroup);
@@ -187,10 +164,6 @@ void PathDeformControls::layoutForSmallScreen()
     connect(deformSlider, &QAbstractSlider::valueChanged, m_renderer, &PathDeformRenderer::setIntensity);
     connect(fontSizeSlider, &QAbstractSlider::valueChanged, m_renderer, &PathDeformRenderer::setFontSize);
     connect(animateButton, &QAbstractButton::clicked, m_renderer, &PathDeformRenderer::setAnimated);
-#if QT_CONFIG(opengl)
-    connect(enableOpenGLButton, &QAbstractButton::clicked, m_renderer, &ArthurFrame::enableOpenGL);
-#endif
-
 
     animateButton->animateClick();
     deformSlider->setValue(80);
@@ -380,7 +353,6 @@ void PathDeformRenderer::setAnimated(bool animated)
 
 void PathDeformRenderer::timerEvent(QTimerEvent *e)
 {
-
     if (e->timerId() == m_repaintTimer.timerId()) {
 
         if (QLineF(QPointF(0,0), m_direction).length() > 1)
@@ -414,22 +386,9 @@ void PathDeformRenderer::timerEvent(QTimerEvent *e)
             m_pos.setY(height() - m_radius);
         }
 
-#if QT_CONFIG(opengl)
-        if (usesOpenGL()) {
-            update();
-        } else
-#endif
-        {
-            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
-            update(rectAfter | rectBefore);
-        }
+        QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+        update(rectAfter | rectBefore);
     }
-//     else if (e->timerId() == m_fpsTimer.timerId()) {
-//         printf("fps: %d\n", m_fpsCounter);
-//         emit frameRate(m_fpsCounter);
-//         m_fpsCounter = 0;
-
-//     }
 }
 
 void PathDeformRenderer::mousePressEvent(QMouseEvent *e)
@@ -478,15 +437,8 @@ void PathDeformRenderer::mouseMoveEvent(QMouseEvent *e)
             m_direction = (m_direction + dir) / 2;
         }
         m_pos = e->position().toPoint() + m_offset;
-#if QT_CONFIG(opengl)
-        if (usesOpenGL()) {
-            update();
-        } else
-#endif
-        {
-            QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
-            update(rectBefore | rectAfter);
-        }
+        QRect rectAfter = circle_bounds(m_pos, m_radius, m_fontSize);
+        update(rectBefore | rectAfter);
     }
 }
 
@@ -570,27 +522,13 @@ void PathDeformRenderer::setRadius(int radius)
     qreal max = qMax(m_radius, (qreal)radius);
     m_radius = radius;
     generateLensPixmap();
-    if (!m_animated || m_radius < max) {
-#if QT_CONFIG(opengl)
-        if (usesOpenGL()){
-            update();
-            return;
-        }
-#endif
+    if (!m_animated || m_radius < max)
         update(circle_bounds(m_pos, max, m_fontSize));
-    }
 }
 
 void PathDeformRenderer::setIntensity(int intensity)
 {
     m_intensity = intensity;
-    if (!m_animated) {
-#if QT_CONFIG(opengl)
-        if (usesOpenGL()) {
-            update();
-            return;
-        }
-#endif
+    if (!m_animated)
         update(circle_bounds(m_pos, m_radius, m_fontSize));
-    }
 }