Merge branch '5.10' into dev

Conflicts:
	.qmake.conf

Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d

1 files changed, 3 insertions, 1 deletions

diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index b9e1d83fe..4254a977f 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -887,6 +887,8 @@ QTextureImageDataPtr TextureLoadingHelper::loadTextureData(QIODevice *data, cons
         if (img.load(data, suffix.toLatin1())) {
             textureData = QTextureImageDataPtr::create();
             textureData->setImage(mirrored ? img.mirrored() : img);
+        } else {
+            qWarning() << "Failed to load textureImage data using QImage";
         }
         break;
     }
@@ -935,7 +937,7 @@ QTextureDataPtr QTextureFromSourceGenerator::operator ()()
             }
 
             for (QString s: qAsConst(ext)) {
-                textureData = TextureLoadingHelper::loadTextureData(&buffer, suffix, true, m_mirrored);
+                textureData = TextureLoadingHelper::loadTextureData(&buffer, s, true, m_mirrored);
                 if (textureData && textureData->data().length() > 0)
                     break;
             }