From 88e588b6bfe5a3daad619705521b4c9329114288 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 23 Sep 2024 14:39:00 +0800 Subject: [PATCH] QQmlListCompositor: fix QT_QML_TRACE_LISTCOMPOSITOR build error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The error was: [...]/qqmllistcompositor.cpp: In member function ‘void QQmlListCompositor::clear()’: [...]/qqmllistcompositor.cpp:907:33: error: expected ‘;’ before string constant 907 | QT_QML_TRACE_LISTCOMPOSITOR("") | ^~ [...]/qqmllistcompositor.cpp:195:103: note: in definition of macro ‘QT_QML_TRACE_LISTCOMPOSITOR’ 195 | #define QT_QML_TRACE_LISTCOMPOSITOR(args) qDebug() << m_end.index[1] << m_end.index[0] << Q_FUNC_INFO args; | ^~~~ Pick-to: 6.8 Change-Id: I60b16707a31c40c44affe9129bc10bf8c9c393b6 Reviewed-by: Fabian Kosmale --- src/qmlmodels/qqmllistcompositor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qmlmodels/qqmllistcompositor.cpp b/src/qmlmodels/qqmllistcompositor.cpp index 2de38d2c4f..6ec6fda936 100644 --- a/src/qmlmodels/qqmllistcompositor.cpp +++ b/src/qmlmodels/qqmllistcompositor.cpp @@ -904,7 +904,7 @@ void QQmlListCompositor::move( void QQmlListCompositor::clear() { - QT_QML_TRACE_LISTCOMPOSITOR("") + QT_QML_TRACE_LISTCOMPOSITOR() for (Range *range = m_ranges.next; range != &m_ranges; range = erase(range)) {} m_end = iterator(m_ranges.next, 0, Default, m_groupCount); m_cacheIt = m_end;