1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid max macro expansion on windows if NOMINMAX is missing

Browse Source 
Pick-to: 6.2
Change-Id: I1c19da59bdf97a434be52239c2a5b1b517341bcb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Alexander Neumann 2021-09-29 12:47:59 +02:00 committed by Thiago Macieira
parent 9d26de4069
commit a4e9ea7a1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/thread/qthread.h
View File

@ -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));
}