diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
| commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
| tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /examples/qmlbars/main.cpp | |
| parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
| parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) | |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
Diffstat (limited to 'examples/qmlbars/main.cpp')
| -rw-r--r-- | examples/qmlbars/main.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/examples/qmlbars/main.cpp b/examples/qmlbars/main.cpp index 58cd5e32..889e2fa4 100644 --- a/examples/qmlbars/main.cpp +++ b/examples/qmlbars/main.cpp @@ -29,6 +29,17 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, 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 + #ifdef Q_OS_ANDROID viewer.addImportPath(QString::fromLatin1("assets:/qml")); viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), |