qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix obvious logic error 

Change-Id: I377036a4ae773f53cdc833efbcd69202c1f479e9
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Niels Ole Salscheider 2014-02-28 21:05:02 +01:00 committed by The Qt Project
parent 4f2084947a
commit a122617ac1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/quick/scenegraph/util/qsgatlastexture.cpp
View File

@ -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);
}