From 2ef512f24312884eddff341428257114d04fc2e2 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 4 Aug 2022 16:41:08 +0200 Subject: Fix generation of the forward header for QFunctionPointer The forward header for QFunctionPointer was being generated by accident, apparently syncqt is confused because of some of the preceding lines. If the lines are rearranged or removed, the header won't be generated. Not sure if there's much value in generating a header for it, but at least one of Qt sources (qeglfsemulatorintegration.h) is using it in an include statment, and there's a chance it's used in the user code as well. Change-Id: Iced505881ddb07e7a8336fcdfb7d3e5397c6466c Reviewed-by: Thiago Macieira (cherry picked from commit 8b2145463b38291dfa0ca2acf4a85552b7383a60) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qglobal.cpp | 2 +- src/corelib/global/qglobal.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 0ca1fc7ef0..89fc6c85cb 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1061,7 +1061,7 @@ static_assert(sizeof(qint64) == 8, "Internal error, qint64 is misdefined"); */ /*! \typedef QFunctionPointer - \relates + \relates This is a typedef for \c{void (*)()}, a pointer to a function that takes no arguments and returns void. diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9249becc27..147933066f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1035,6 +1035,9 @@ Q_CORE_EXPORT void qBadAlloc(); template inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } +#if 0 +#pragma qt_class(QFunctionPointer) +#endif typedef void (*QFunctionPointer)(); #if !defined(Q_UNIMPLEMENTED) -- cgit v1.2.3