summaryrefslogtreecommitdiffstats
path: root/examples/opengl/2dpainting
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/2dpainting')
-rw-r--r--examples/opengl/2dpainting/2dpainting.pro2
-rw-r--r--examples/opengl/2dpainting/glwidget.cpp5
-rw-r--r--examples/opengl/2dpainting/glwidget.h4
-rw-r--r--examples/opengl/2dpainting/main.cpp6
-rw-r--r--examples/opengl/2dpainting/widget.cpp2
5 files changed, 13 insertions, 6 deletions
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index 08383a4d39..b9611f5b40 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -1,4 +1,4 @@
-QT += opengl widgets
+QT += widgets
HEADERS = glwidget.h \
helper.h \
diff --git a/examples/opengl/2dpainting/glwidget.cpp b/examples/opengl/2dpainting/glwidget.cpp
index 0443d5b5bd..5e040ae347 100644
--- a/examples/opengl/2dpainting/glwidget.cpp
+++ b/examples/opengl/2dpainting/glwidget.cpp
@@ -41,11 +41,12 @@
#include "glwidget.h"
#include "helper.h"
+#include <QPainter>
#include <QTimer>
//! [0]
GLWidget::GLWidget(Helper *helper, QWidget *parent)
- : QGLWidget(QGLFormat(QGL::SampleBuffers), parent), helper(helper)
+ : QOpenGLWidget(parent), helper(helper)
{
elapsed = 0;
setFixedSize(200, 200);
@@ -57,7 +58,7 @@ GLWidget::GLWidget(Helper *helper, QWidget *parent)
void GLWidget::animate()
{
elapsed = (elapsed + qobject_cast<QTimer*>(sender())->interval()) % 1000;
- repaint();
+ update();
}
//! [1]
diff --git a/examples/opengl/2dpainting/glwidget.h b/examples/opengl/2dpainting/glwidget.h
index fec1be12f7..07b279117c 100644
--- a/examples/opengl/2dpainting/glwidget.h
+++ b/examples/opengl/2dpainting/glwidget.h
@@ -41,12 +41,12 @@
#ifndef GLWIDGET_H
#define GLWIDGET_H
-#include <QGLWidget>
+#include <QOpenGLWidget>
//! [0]
class Helper;
-class GLWidget : public QGLWidget
+class GLWidget : public QOpenGLWidget
{
Q_OBJECT
diff --git a/examples/opengl/2dpainting/main.cpp b/examples/opengl/2dpainting/main.cpp
index 5daff5c66f..fb3454b1cd 100644
--- a/examples/opengl/2dpainting/main.cpp
+++ b/examples/opengl/2dpainting/main.cpp
@@ -41,10 +41,16 @@
#include "window.h"
#include <QApplication>
+#include <QSurfaceFormat>
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
+
+ QSurfaceFormat fmt;
+ fmt.setSamples(4);
+ QSurfaceFormat::setDefaultFormat(fmt);
+
Window window;
window.show();
return app.exec();
diff --git a/examples/opengl/2dpainting/widget.cpp b/examples/opengl/2dpainting/widget.cpp
index 12b7935a94..edfff5ba79 100644
--- a/examples/opengl/2dpainting/widget.cpp
+++ b/examples/opengl/2dpainting/widget.cpp
@@ -57,7 +57,7 @@ Widget::Widget(Helper *helper, QWidget *parent)
void Widget::animate()
{
elapsed = (elapsed + qobject_cast<QTimer*>(sender())->interval()) % 1000;
- repaint();
+ update();
}
//! [1]