Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

1 files changed, 48 insertions, 0 deletions

diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h
new file mode 100644
index 00000000..43375a9c
--- /dev/null
+++ b/src/datavisualization/utils/qutils.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#ifndef QUTILS_H
+#define QUTILS_H
+
+#include <QtGui/QSurfaceFormat>
+
+namespace QtDataVisualization {
+
+inline static QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true)
+{
+    QSurfaceFormat surfaceFormat;
+
+    surfaceFormat.setDepthBufferSize(24);
+    surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
+#if !defined(QT_OPENGL_ES_2)
+    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
+#else
+    // Antialias not supported for ES
+    antialias = false;
+    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGLES);
+#endif
+
+    if (antialias)
+        surfaceFormat.setSamples(8);
+
+    return surfaceFormat;
+}
+
+}
+
+#endif