mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-02 22:35:31 +08:00
1d4128f08e
* apply patches to make qtmultimedia work with gestreamer on windows * version stuff * remove libnice from ci.baseline * move gstreamer on osx as fail to baseline * add supports field to qtmultimedia. Qt does not officially support x86 on windows * version stuff * remove duplicated patch * version stuff * add upstream patch to fix x86-windows * [skip actions] version stuff
14 lines
592 B
Diff
14 lines
592 B
Diff
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
|
|
index 5dc4d2222..1696dbc80 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));
|
|
}
|