[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[Sam James]

commit:     898d75f14f78260fd90857704d69de5ec6a8d31c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 18 07:01:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:15:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898d75f1

dev-qt/qtgui: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25076
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ----------------------
 1 file changed, 50 deletions(-)

diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc39759..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
- 
-     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
- 
--    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
--          IsDebugAndRelease)
-+    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+        set(IsDebugAndRelease FALSE)
-+        set (list_var ${ARGN})
-+        list(LENGTH list_var num_extra_arg)
-+        if (${num_extra_arg} GREATER 0)
-+            list(GET list_var 0 IsDebugAndRelease)
-+        endif()
-+
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[Andreas Sturmlechner]

commit:     bef432ba24454b24ded98f376e2dcda93a2a555e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 12:13:59 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 12:23:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef432ba

dev-qt/qtgui: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...-update-_NET_SUPPORTED-when-WM-changes-it.patch | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch
deleted file mode 100644
index 0d0acdf63a99..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 97acde2828c8814671f4938e0c4805d945a4d110 Mon Sep 17 00:00:00 2001
-From: Tang Haixiang <tanghaixiang@uniontech.com>
-Date: Thu, 25 Feb 2021 18:05:17 +0800
-Subject: [PATCH] xcb: Update _NET_SUPPORTED when the window manager changes it
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In some cases, the application may start before the window manager, and in some window managers
-_NET_SUPPORTED may be changed. These situations will cause the _NET_SUPPORTED value obtained by Qt
-to be inconsistent with the window manager.
-
-Fixes: QTBUG-91396
-Change-Id: I63c6934ad2538cdb9f05926b3748216bd0dcf04e
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-
-
-(cherry picked from commit acb0065cc7e4ee849cc87ce72e46b05a61370c43)
----
- src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
-index 8477e28df1..6aa61e0d34 100644
---- a/src/plugins/platforms/xcb/qxcbconnection.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -659,6 +659,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
-             QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window);
-             if (virtualDesktop)
-                 virtualDesktop->updateWorkArea();
-+        } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) {
-+            m_wmSupport->updateNetWMAtoms();
-         } else {
-             HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent);
-         }
--- 
-GitLab
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[Ionen Wolkens]

commit:     66823bae94521bcf379c3875d63992a11a30848d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 23:38:14 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 23:40:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66823bae

dev-qt/qtgui: use a safer fix for xkbcommon-1.6.0

Do not believe it matters either way given these should be unused,
but shouldn't hurt to inline instead until upstream's own fix.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
index d0da76580df2..92e907067fe6 100644
--- a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
+++ b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
@@ -7,8 +7,12 @@ Just a quick fix while waiting for what [2] comes up with.
 [2] https://bugreports.qt.io/browse/QTBUG-117950
 --- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
 +++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
-@@ -276,4 +275,0 @@
+@@ -276,4 +276,4 @@
 -        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
 -        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
 -        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
 -        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
++        Xkb2Qt<0xfe90,                          Qt::Key_Dead_Lowline>,
++        Xkb2Qt<0xfe91,                          Qt::Key_Dead_Aboveverticalline>,
++        Xkb2Qt<0xfe92,                          Qt::Key_Dead_Belowverticalline>,
++        Xkb2Qt<0xfe93,                          Qt::Key_Dead_Longsolidusoverlay>,

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[Ionen Wolkens]

commit:     bff11bebd8f6deda98703e76d6c2b50467afad68
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 09:15:16 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 09:19:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff11beb

dev-qt/qtgui: update description for xkbcommon160.patch

Current temporary fix is expectedly different than what upstream
did, but is not an issue -- due for cleanup either way.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
index 92e907067fe6..0b5b3f964d57 100644
--- a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
+++ b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch
@@ -3,8 +3,12 @@ unnecesary. Usage results in build failure.
 
 Just a quick fix while waiting for what [2] comes up with.
 
+Update: will be fixed by [3], see also [4]
+
 [1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70
 [2] https://bugreports.qt.io/browse/QTBUG-117950
+[3] https://invent.kde.org/qt/qt/qtbase/-/merge_requests/290
+[4] https://bugs.gentoo.org/915510
 --- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
 +++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
 @@ -276,4 +276,4 @@

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/

[Conrad Kostecki]

commit:     a6910b9337007134691025849ca4e7ecc2620eeb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:04:42 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6910b93

dev-qt/qtgui: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch | 228 ---------------------
 1 file changed, 228 deletions(-)

diff --git a/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch b/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch
deleted file mode 100644
index 41a500c82578..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.12-CVE-2024-25580.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From c8061284095abebebbcd6fea7167477aef44a00c Mon Sep 17 00:00:00 2001
-From: Jonas Karlsson <jonas.karlsson@qt.io>
-Date: Thu, 8 Feb 2024 17:01:05 +0100
-Subject: [PATCH] Improve KTX file reading memory safety
-
-* Use qAddOverflow/qSubOverflow methods for catching additions and
-  subtractions with overflow and handle these scenarios when reading the
-  file.
-* Add 'safeView' method that checks that the byte array view constructed
-  is not out of bounds.
-* Return error if number of levels is higher than what is reasonable.
-* Return error if number of faces is incorrect.
-* Add unit test with invalid KTX file previously causing a segmentation
-  fault.
-
-This fixes CVE-2024-25580.
-
-Fixes: QTBUG-121918
-Pick-to: 6.7 6.6 6.5 6.2 5.15
-Change-Id: Ie0824c32a5921de30cf07c1fc1b49a084e6d07b2
-Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-(cherry picked from commit 28ecb523ce8490bff38b251b3df703c72e057519)
----
- src/gui/util/qktxhandler.cpp | 138 +++++++++++++++++++++++++++--------
- src/gui/util/qktxhandler_p.h |   2 +-
- 2 files changed, 110 insertions(+), 30 deletions(-)
-
-diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp
-index 7eda4c46fb..2853e46c3d 100644
---- a/src/gui/util/qktxhandler.cpp
-+++ b/src/gui/util/qktxhandler.cpp
-@@ -73,7 +73,7 @@ struct KTXHeader {
-     quint32 bytesOfKeyValueData;
- };
- 
--static const quint32 headerSize = sizeof(KTXHeader);
-+static constexpr quint32 qktxh_headerSize = sizeof(KTXHeader);
- 
- // Currently unused, declared for future reference
- struct KTXKeyValuePairItem {
-@@ -103,11 +103,36 @@ struct KTXMipmapLevel {
-     */
- };
- 
--bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block)
-+static bool qAddOverflow(quint32 v1, quint32 v2, quint32 *r) {
-+    // unsigned additions are well-defined
-+    *r = v1 + v2;
-+    return v1 > quint32(v1 + v2);
-+}
-+
-+// Returns the nearest multiple of 4 greater than or equal to 'value'
-+static bool nearestMultipleOf4(quint32 value, quint32 *result)
-+{
-+    constexpr quint32 rounding = 4;
-+    *result = 0;
-+    if (qAddOverflow(value, rounding - 1, result))
-+        return true;
-+    *result &= ~(rounding - 1);
-+    return false;
-+}
-+
-+// Returns a slice with prechecked bounds
-+static QByteArray safeSlice(const QByteArray& array, quint32 start, quint32 length)
- {
--    Q_UNUSED(suffix)
-+    quint32 end = 0;
-+    if (qAddOverflow(start, length, &end) || end > quint32(array.length()))
-+        return {};
-+    return QByteArray(array.data() + start, length);
-+}
- 
--    return (qstrncmp(block.constData(), ktxIdentifier, KTX_IDENTIFIER_LENGTH) == 0);
-+bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block)
-+{
-+    Q_UNUSED(suffix);
-+    return block.startsWith(QByteArray::fromRawData(ktxIdentifier, KTX_IDENTIFIER_LENGTH));
- }
- 
- QTextureFileData QKtxHandler::read()
-@@ -115,42 +140,97 @@ QTextureFileData QKtxHandler::read()
-     if (!device())
-         return QTextureFileData();
- 
--    QByteArray buf = device()->readAll();
--    const quint32 dataSize = quint32(buf.size());
--    if (dataSize < headerSize || !canRead(QByteArray(), buf)) {
--        qCDebug(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData());
-+    const QByteArray buf = device()->readAll();
-+    if (size_t(buf.size()) > std::numeric_limits<quint32>::max()) {
-+        qWarning(lcQtGuiTextureIO, "Too big KTX file %s", logName().constData());
-+        return QTextureFileData();
-+    }
-+
-+    if (!canRead(QByteArray(), buf)) {
-+        qWarning(lcQtGuiTextureIO, "Invalid KTX file %s", logName().constData());
-+        return QTextureFileData();
-+    }
-+
-+    if (buf.size() < qsizetype(qktxh_headerSize)) {
-+        qWarning(lcQtGuiTextureIO, "Invalid KTX header size in %s", logName().constData());
-         return QTextureFileData();
-     }
- 
--    const KTXHeader *header = reinterpret_cast<const KTXHeader *>(buf.constData());
--    if (!checkHeader(*header)) {
--        qCDebug(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData());
-+    KTXHeader header;
-+    memcpy(&header, buf.data(), qktxh_headerSize);
-+    if (!checkHeader(header)) {
-+        qWarning(lcQtGuiTextureIO, "Unsupported KTX file format in %s", logName().constData());
-         return QTextureFileData();
-     }
- 
-     QTextureFileData texData;
-     texData.setData(buf);
- 
--    texData.setSize(QSize(decode(header->pixelWidth), decode(header->pixelHeight)));
--    texData.setGLFormat(decode(header->glFormat));
--    texData.setGLInternalFormat(decode(header->glInternalFormat));
--    texData.setGLBaseInternalFormat(decode(header->glBaseInternalFormat));
--
--    texData.setNumLevels(decode(header->numberOfMipmapLevels));
--    quint32 offset = headerSize + decode(header->bytesOfKeyValueData);
--    const int maxLevels = qMin(texData.numLevels(), 32);               // Cap iterations in case of corrupt file.
--    for (int i = 0; i < maxLevels; i++) {
--        if (offset + sizeof(KTXMipmapLevel) > dataSize)                // Corrupt file; avoid oob read
--            break;
--        const KTXMipmapLevel *level = reinterpret_cast<const KTXMipmapLevel *>(buf.constData() + offset);
--        quint32 levelLen = decode(level->imageSize);
--        texData.setDataOffset(offset + sizeof(KTXMipmapLevel::imageSize), i);
--        texData.setDataLength(levelLen, i);
--        offset += sizeof(KTXMipmapLevel::imageSize) + levelLen + (3 - ((levelLen + 3) % 4));
-+    texData.setSize(QSize(decode(header.pixelWidth), decode(header.pixelHeight)));
-+    texData.setGLFormat(decode(header.glFormat));
-+    texData.setGLInternalFormat(decode(header.glInternalFormat));
-+    texData.setGLBaseInternalFormat(decode(header.glBaseInternalFormat));
-+
-+    texData.setNumLevels(decode(header.numberOfMipmapLevels));
-+
-+    const quint32 bytesOfKeyValueData = decode(header.bytesOfKeyValueData);
-+    quint32 headerKeyValueSize;
-+    if (qAddOverflow(qktxh_headerSize, bytesOfKeyValueData, &headerKeyValueSize)) {
-+        qWarning(lcQtGuiTextureIO, "Overflow in size of key value data in header of KTX file %s",
-+                 logName().constData());
-+        return QTextureFileData();
-+    }
-+
-+    if (headerKeyValueSize >= quint32(buf.size())) {
-+        qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
-+        return QTextureFileData();
-+    }
-+
-+    // Technically, any number of levels is allowed but if the value is bigger than
-+    // what is possible in KTX V2 (and what makes sense) we return an error.
-+    // maxLevels = log2(max(width, height, depth))
-+    const int maxLevels = (sizeof(quint32) * 8)
-+            - qCountLeadingZeroBits(std::max(
-+                    { header.pixelWidth, header.pixelHeight, header.pixelDepth }));
-+
-+    if (texData.numLevels() > maxLevels) {
-+        qWarning(lcQtGuiTextureIO, "Too many levels in KTX file %s", logName().constData());
-+        return QTextureFileData();
-+    }
-+
-+    quint32 offset = headerKeyValueSize;
-+    for (int level = 0; level < texData.numLevels(); level++) {
-+        const auto imageSizeSlice = safeSlice(buf, offset, sizeof(quint32));
-+        if (imageSizeSlice.isEmpty()) {
-+            qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
-+            return QTextureFileData();
-+        }
-+
-+        const quint32 imageSize = decode(qFromUnaligned<quint32>(imageSizeSlice.data()));
-+        offset += sizeof(quint32); // overflow checked indirectly above
-+
-+        texData.setDataOffset(offset, level);
-+        texData.setDataLength(imageSize, level);
-+
-+        // Add image data and padding to offset
-+        quint32 padded = 0;
-+        if (nearestMultipleOf4(imageSize, &padded)) {
-+            qWarning(lcQtGuiTextureIO, "Overflow in KTX file %s", logName().constData());
-+            return QTextureFileData();
-+        }
-+
-+        quint32 offsetNext;
-+        if (qAddOverflow(offset, padded, &offsetNext)) {
-+            qWarning(lcQtGuiTextureIO, "OOB request in KTX file %s", logName().constData());
-+            return QTextureFileData();
-+        }
-+
-+        offset = offsetNext;
-     }
- 
-     if (!texData.isValid()) {
--        qCDebug(lcQtGuiTextureIO, "Invalid values in header of KTX file %s", logName().constData());
-+        qWarning(lcQtGuiTextureIO, "Invalid values in header of KTX file %s",
-+                 logName().constData());
-         return QTextureFileData();
-     }
- 
-@@ -191,7 +271,7 @@ bool QKtxHandler::checkHeader(const KTXHeader &header)
-             (decode(header.numberOfFaces) == 1));
- }
- 
--quint32 QKtxHandler::decode(quint32 val)
-+quint32 QKtxHandler::decode(quint32 val) const
- {
-     return inverseEndian ? qbswap<quint32>(val) : val;
- }
-diff --git a/src/gui/util/qktxhandler_p.h b/src/gui/util/qktxhandler_p.h
-index 19f7b0e79a..8da990aaac 100644
---- a/src/gui/util/qktxhandler_p.h
-+++ b/src/gui/util/qktxhandler_p.h
-@@ -68,7 +68,7 @@ public:
- 
- private:
-     bool checkHeader(const KTXHeader &header);
--    quint32 decode(quint32 val);
-+    quint32 decode(quint32 val) const;
- 
-     bool inverseEndian = false;
- };
--- 
-2.43.0
-