From d593c5865acb544d02e45ac24245d9bc9988ffb1 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Thu, 12 Dec 2019 14:06:31 +0100
Subject: Remove QOpenGLTexture dependency from QTextureFileData

Just print the hex value of the format.

Task-number: QTBUG-74409
Change-Id: I0441eda050735325f7686532b17ef765f71bec9b
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/gui/util/qtexturefiledata.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/gui/util/qtexturefiledata.cpp')

diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index 41cbd1b15a..3c8130c229 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -38,11 +38,7 @@
 ****************************************************************************/
 
 #include "qtexturefiledata_p.h"
-#include <QMetaEnum>
 #include <QSize>
-#if QT_CONFIG(opengl)
-#include <QOpenGLTexture>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -247,13 +243,7 @@ void QTextureFileData::setLogName(const QByteArray &name)
 
 static QByteArray glFormatName(quint32 fmt)
 {
-    const char *id = nullptr;
-#if QT_CONFIG(opengl)
-    id = QMetaEnum::fromType<QOpenGLTexture::TextureFormat>().valueToKey(fmt);
-#endif
-    QByteArray res(id ? id : "(?)");
-    res += " [0x" + QByteArray::number(fmt, 16).rightJustified(4, '0') + ']';
-    return res;
+    return QByteArray("0x" + QByteArray::number(fmt, 16).rightJustified(4, '0'));
 }
 
 QDebug operator<<(QDebug dbg, const QTextureFileData &d)
-- 
cgit v1.2.3