From 4de720a4568c4243dd7427e54cd12e605eb43c8b Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Fri, 9 Aug 2019 11:12:33 -0700 Subject: [PATCH] Enable the event-queue hack on Linux in addition to Windows --- assignment-client/src/avatars/AvatarMixerSlavePool.h | 2 +- libraries/shared/src/shared/QtHelpers.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixerSlavePool.h b/assignment-client/src/avatars/AvatarMixerSlavePool.h index c8f4c252b1..915c6d8dc4 100644 --- a/assignment-client/src/avatars/AvatarMixerSlavePool.h +++ b/assignment-client/src/avatars/AvatarMixerSlavePool.h @@ -75,7 +75,7 @@ public: void each(std::function functor); #ifdef DEBUG_EVENT_QUEUE - void AvatarMixerSlavePool::queueStats(QJsonObject& stats); + void queueStats(QJsonObject& stats); #endif void setNumThreads(int numThreads); diff --git a/libraries/shared/src/shared/QtHelpers.h b/libraries/shared/src/shared/QtHelpers.h index cde6ecdbb7..f57ba4af2d 100644 --- a/libraries/shared/src/shared/QtHelpers.h +++ b/libraries/shared/src/shared/QtHelpers.h @@ -12,10 +12,10 @@ #include -#ifdef WIN32 +#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) // Enable event queue debugging #define DEBUG_EVENT_QUEUE -#endif // WIN32 +#endif namespace hifi { namespace qt { void addBlockingForbiddenThread(const QString& name, QThread* thread = nullptr);