diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2014-02-28 21:05:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-13 23:33:30 +0100 |
| commit | a122617ac110c1d98dbf2bbde1b1b4a8d6a2ee0b (patch) | |
| tree | 1c42fa94b461b825657d0fab732232ea88fe7276 /src/quick | |
| parent | 4f2084947afbf8bac0d7742a32b5584e13da39c0 (diff) | |
Fix obvious logic error
Change-Id: I377036a4ae773f53cdc833efbcd69202c1f479e9
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index 333bc62143..997d58de0f 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -269,7 +269,7 @@ void Atlas::uploadBgra(Texture *texture) QImage image = texture->image(); if (image.format() != QImage::Format_ARGB32_Premultiplied - || image.format() != QImage::Format_RGB32) { + && image.format() != QImage::Format_RGB32) { image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); } |