From a4e9ea7a1faea5e6cdb82ddda32450df71232c90 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <neumann@imt.uni-luebeck.de>
Date: Wed, 29 Sep 2021 12:47:59 +0200
Subject: [PATCH] avoid max macro expansion on windows if NOMINMAX is missing

Pick-to: 6.2
Change-Id: I1c19da59bdf97a434be52239c2a5b1b517341bcb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/thread/qthread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index e48354dedb5..89b4a0776c1 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -120,7 +120,7 @@ public:
     bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever));
     bool wait(unsigned long time)
     {
-        if (time == std::numeric_limits<unsigned long>::max())
+        if (time == (std::numeric_limits<unsigned long>::max)())
             return wait(QDeadlineTimer(QDeadlineTimer::Forever));
         return wait(QDeadlineTimer(time));
     }