diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
commit | 87d9234d71122f0332c37c81ca0338ddcda7eeba (patch) | |
tree | 3b92ae44963945225ec7d95284c4bda5bb1afeff /src/quick/scenegraph/compressedtexture | |
parent | add46fd9055088e6aa458f21558234e267eb60ca (diff) | |
parent | 9b5bd48fc652a7dd47c545db8338a580592f7f35 (diff) | |
download | qtdeclarative-87d9234d71122f0332c37c81ca0338ddcda7eeba.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I024445b3401a57040d7d67780ea32d2f8b02f41a
Diffstat (limited to 'src/quick/scenegraph/compressedtexture')
-rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp index 46b2c6386c..e981921c69 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture.cpp @@ -151,7 +151,7 @@ Texture::~Texture() bool Texture::hasAlphaChannel() const { - return QSGCompressedTexture::formatIsOpaque(static_cast<Atlas*>(m_atlas)->format()); + return !QSGCompressedTexture::formatIsOpaque(static_cast<Atlas*>(m_atlas)->format()); } QSGTexture *Texture::removedFromAtlas() const |