From 944c5f40b3ca48f89456abeb821b3fe7ba6babf4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 13 Jul 2019 00:22:54 +0200 Subject: QAbstractMetaCallEvent: fix compilation with out feature.thread on Clang Clang warns that the private field semaphore_ is unused, and is correct, of course. Change-Id: Ic1372cedd3f4b2facca9f6f6be398d26f406b379 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/kernel/qobject_p.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 9cf1bfed08..95ffc1b2e8 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -486,8 +486,11 @@ class Q_CORE_EXPORT QAbstractMetaCallEvent : public QEvent { public: QAbstractMetaCallEvent(const QObject *sender, int signalId, QSemaphore *semaphore = nullptr) - : QEvent(MetaCall), signalId_(signalId), sender_(sender), semaphore_(semaphore) - {} + : QEvent(MetaCall), signalId_(signalId), sender_(sender) +#if QT_CONFIG(thread) + , semaphore_(semaphore) +#endif + { Q_UNUSED(semaphore); } ~QAbstractMetaCallEvent(); virtual void placeMetaCall(QObject *object) = 0; @@ -498,7 +501,9 @@ public: private: int signalId_; const QObject *sender_; +#if QT_CONFIG(thread) QSemaphore *semaphore_; +#endif }; class Q_CORE_EXPORT QMetaCallEvent : public QAbstractMetaCallEvent -- cgit v1.2.3