summaryrefslogtreecommitdiffstats
path: root/tests/qmlcamera
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-17 13:56:57 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-17 14:50:20 +0200
commitc42c5a5fb801ea1f6c11c44f4719f9b175fc38d8 (patch)
tree77b4fe80a363389ccebc106a97f784f55b60a3dd /tests/qmlcamera
parentfba185e6c2fa5158aa60ba4468c1f1a70177f77a (diff)
Fix various issues for previous commit
Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'tests/qmlcamera')
-rw-r--r--tests/qmlcamera/main.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/qmlcamera/main.cpp b/tests/qmlcamera/main.cpp
index 146e91fa..f35e9fc8 100644
--- a/tests/qmlcamera/main.cpp
+++ b/tests/qmlcamera/main.cpp
@@ -25,17 +25,15 @@ int main(int argc, char *argv[])
QtQuick2ApplicationViewer viewer;
+#if !defined(QT_OPENGL_ES_2)
// Enable antialiasing
QSurfaceFormat surfaceFormat;
surfaceFormat.setDepthBufferSize(24);
-#if !defined(QT_OPENGL_ES_2)
surfaceFormat.setSamples(8);
surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
-#else
- surfaceFormat.setRenderableType(QSurfaceFormat::OpenGLES);
-#endif
surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
viewer.setFormat(surfaceFormat);
+#endif
#ifdef Q_OS_ANDROID
viewer.addImportPath(QString::fromLatin1("assets:/qml"));