diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-12-12 14:06:31 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-03 22:40:14 +0100 |
| commit | d593c5865acb544d02e45ac24245d9bc9988ffb1 (patch) | |
| tree | b331682ebd221f721e96e850cb4f74fc0f7c7da4 /src | |
| parent | 65b8514cb5eae5a7055f55fd375da7b2eea487d6 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/qtexturefiledata.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
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) |