Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/corelib/global/qglobal.h
	src/platformsupport/platformcompositor/qopenglcompositor.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I5422868500be695584a496dbbbc719d146bc572d

1 files changed, 2 insertions, 2 deletions

diff --git a/src/platformsupport/platformcompositor/qopenglcompositor.cpp b/src/platformsupport/platformcompositor/qopenglcompositor.cpp
index 3fefdc4935..bcb3f21922 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositor.cpp
+++ b/src/platformsupport/platformcompositor/qopenglcompositor.cpp
@@ -177,7 +177,7 @@ void QOpenGLCompositor::render(QOpenGLCompositorWindow *window)
             const bool translucent = window->sourceWindow()->requestedFormat().alphaBufferSize() > 0;
             blend.set(translucent);
             m_blitter.blit(textureId, target, QOpenGLTextureBlitter::OriginTopLeft);
-        } else if (!textures->stacksOnTop(i)) {
+        } else if (!textures->flags(i).testFlag(QPlatformTextureList::StacksOnTop)) {
             // Texture from an FBO belonging to a QOpenGLWidget
             blend.set(false);
             m_blitter.blit(textureId, target, QOpenGLTextureBlitter::OriginBottomLeft);
@@ -185,7 +185,7 @@ void QOpenGLCompositor::render(QOpenGLCompositorWindow *window)
     }
 
     for (int i = 0; i < textures->count(); ++i) {
-        if (textures->stacksOnTop(i)) {
+        if (textures->flags(i).testFlag(QPlatformTextureList::StacksOnTop)) {
             QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(textures->geometry(i), targetWindowRect);
             blend.set(true);
             m_blitter.blit(textures->textureId(i), target, QOpenGLTextureBlitter::OriginBottomLeft);