aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-05-31 13:48:17 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-05-31 13:48:36 +0200
commit7e73dc01f85355e23a4ee07c0b624b253541acdc (patch)
treea59b33bfbc2b11d72e9a12324c105bf7a367eec9 /src/quick/scenegraph
parente171d1e8c4b4324374cb57a6d7d181a57fc17dbe (diff)
parente840b9e2c56a786ef7c4232b8fb2f1df1b285da4 (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 1c7f9cd800..c47250662b 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -54,6 +54,7 @@
#include <QGuiApplication>
#include <QOpenGLContext>
+#include <QQuickWindow>
#include <QtGui/qopenglframebufferobject.h>
#include <private/qqmlglobal_p.h>
@@ -396,6 +397,8 @@ QSurfaceFormat QSGContext::defaultSurfaceFormat() const
QSurfaceFormat format;
format.setDepthBufferSize(24);
format.setStencilBufferSize(8);
+ if (QQuickWindow::hasDefaultAlphaBuffer())
+ format.setAlphaBufferSize(8);
format.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
return format;
}