[office/alkimia/8.2] src: Fix functional qDebug() override for Qt 6.12
Ralf Habacker <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 2da75447021aef8ed10d89fede97c7e0d5b624f8 by Ralf Habacker.
Committed on 17/08/2026 at 20:11.
Pushed by habacker into branch '8.2'.
Fix functional qDebug() override for Qt 6.12
This fixes the following build error with Qt 6.12.0 and GCC 16:
qrangemodel_impl.h:958:21:
error: there are no arguments to ‘qDebug’ that depend on a
template parameter, so a declaration of ‘qDebug’ must be
available [-Wtemplate-body]
The reason is that Qt 6.12.0 introduced a functional qDebug() call
into a public header, while alkdebug.h undefines qDebug.
(cherry picked from commit f8485a3b31b5ca3a55bb56b742c65e5d89d3f432)
M +1 -2 src/alkdebug.h
https://invent.kde.org/office/alkimia/-/commit/2da75447021aef8ed10d89fede97c7e0d5b624f8
diff --git a/src/alkdebug.h b/src/alkdebug.h
index c9bd9d48..cf17d3bc 100644
--- a/src/alkdebug.h
+++ b/src/alkdebug.h
@@ -16,8 +16,7 @@
#include <QtDebug>
-// we do not want to support qDebug
-#undef qDebug
+// do not cover qDebug-style functional calls
QDebug _alkDebug(const char *file, int line, const char *func);
#define alkDebug() _alkDebug(__FILE__, __LINE__, Q_FUNC_INFO)