diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:21 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:22 +0100 |
commit | 6620045fcaada61a2897195f32c0ee35beebc37b (patch) | |
tree | 1a4027d021c10999bc1ff3ad9dc6e17ebb57dfc6 /src/gui/kernel | |
parent | 9baf824e4df5e9bc58b4fa1dc86e9a2e0d396ebb (diff) | |
parent | 0649afd60c4d81fd8a6904d4e32737c647af578f (diff) |
Merge dev into 5.7
Change-Id: I5c60b4d9fd8355ddd49a01e21861f36afbbf889b
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qsurfaceformat.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 83481692ff..d7dc0faceb 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -282,11 +282,8 @@ QSurfaceFormat::~QSurfaceFormat() void QSurfaceFormat::setStereo(bool enable) { QSurfaceFormat::FormatOptions newOptions = d->opts; - if (enable) { - newOptions |= QSurfaceFormat::StereoBuffers; - } else { - newOptions &= ~QSurfaceFormat::StereoBuffers; - } + newOptions.setFlag(QSurfaceFormat::StereoBuffers, enable); + if (int(newOptions) != int(d->opts)) { detach(); d->opts = newOptions; |