diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-17 13:56:57 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-17 14:50:20 +0200 |
| commit | c42c5a5fb801ea1f6c11c44f4719f9b175fc38d8 (patch) | |
| tree | 77b4fe80a363389ccebc106a97f784f55b60a3dd /examples | |
| parent | fba185e6c2fa5158aa60ba4468c1f1a70177f77a (diff) | |
Fix various issues for previous commit
Change-Id: I4a4c9e46df0517e563cfa1d6930e636fab213bfc
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmlbars/main.cpp | 6 | ||||
| -rw-r--r-- | examples/qmlcustominput/main.cpp | 6 | ||||
| -rw-r--r-- | examples/qmlscatter/main.cpp | 6 | ||||
| -rw-r--r-- | examples/qmlsurface/main.cpp | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/examples/qmlbars/main.cpp b/examples/qmlbars/main.cpp index 49bacdc8..889e2fa4 100644 --- a/examples/qmlbars/main.cpp +++ b/examples/qmlbars/main.cpp @@ -30,17 +30,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")); diff --git a/examples/qmlcustominput/main.cpp b/examples/qmlcustominput/main.cpp index 91ba6588..8724e511 100644 --- a/examples/qmlcustominput/main.cpp +++ b/examples/qmlcustominput/main.cpp @@ -30,17 +30,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")); diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp index 43c0a9fb..159612e9 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/qmlscatter/main.cpp @@ -30,17 +30,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")); diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp index 428e4026..21c987b3 100644 --- a/examples/qmlsurface/main.cpp +++ b/examples/qmlsurface/main.cpp @@ -30,17 +30,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")); |