From 089a63e6738a9f5dd00a61abc9b0748045a7ed9a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 26 Feb 2022 04:06:35 +0200 Subject: [PATCH] partial build fix for the case when QT_NO_SIGNALMAPPER is defined Signed-off-by: Ivailo Monev --- src/core/global/qconfig.h.cmake | 4 ++-- tests/auto/qsignalmapper/tst_qsignalmapper.cpp | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake index 21ed3540a..a824d5758 100644 --- a/src/core/global/qconfig.h.cmake +++ b/src/core/global/qconfig.h.cmake @@ -132,6 +132,8 @@ // #cmakedefine QT_NO_RUBBERBAND // #cmakedefine QT_NO_SCROLLAREA // #cmakedefine QT_NO_SCROLLBAR +// #cmakedefine QT_NO_SHORTCUT +// #cmakedefine QT_NO_SIGNALMAPPER // Misc #cmakedefine QT_NO_USING_NAMESPACE @@ -173,8 +175,6 @@ #cmakedefine QT_NO_QUATERNION #cmakedefine QT_NO_QUUID_STRING #cmakedefine QT_NO_SHAREDMEMORY -#cmakedefine QT_NO_SHORTCUT -#cmakedefine QT_NO_SIGNALMAPPER #cmakedefine QT_NO_SIZEGRIP #cmakedefine QT_NO_SLIDER #cmakedefine QT_NO_SORTFILTERPROXYMODEL diff --git a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp index deaafa491..9936814d2 100644 --- a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp +++ b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp @@ -26,8 +26,10 @@ #include #include -//TESTED_CLASS= -//TESTED_FILES= +// TESTED_CLASS= +// TESTED_FILES= + +#ifndef QT_NO_SIGNALMAPPER class tst_QSignalMapper : public QObject { @@ -131,3 +133,9 @@ void tst_QSignalMapper::mapped() QTEST_MAIN(tst_QSignalMapper) #include "moc_tst_qsignalmapper.cpp" + +#else // QT_NO_SIGNALMAPPER + +QTEST_NOOP_MAIN + +#endif // QT_NO_SIGNALMAPPER