Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 3 insertions, 9 deletions

diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp
index 21c987b3..03518d00 100644
--- a/examples/qmlsurface/main.cpp
+++ b/examples/qmlsurface/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -16,6 +16,7 @@
 **
 ****************************************************************************/
 
+#include <QtDataVisualization/qutils.h>
 #include <QtGui/QGuiApplication>
 #include "qtquick2applicationviewer.h"
 
@@ -30,15 +31,8 @@ int main(int argc, char *argv[])
 
     QtQuick2ApplicationViewer viewer;
 
-#if !defined(QT_OPENGL_ES_2)
     // Enable antialiasing
-    QSurfaceFormat surfaceFormat;
-    surfaceFormat.setDepthBufferSize(24);
-    surfaceFormat.setSamples(8);
-    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
-    surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
-    viewer.setFormat(surfaceFormat);
-#endif
+    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
 
 #ifdef Q_OS_ANDROID
     viewer.addImportPath(QString::fromLatin1("assets:/qml"));