Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ia03a010d1fbfc89c04144c1c106336f0e1c45ec1

1 files changed, 6 insertions, 0 deletions

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();