diff options
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index d311e7810e..02d925d37d 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -46,6 +46,11 @@ #include <QtTest/private/qtestlog_p.h> #include "qtestoptions_p.h" #include <QtTest/qbenchmark.h> +// qbenchmark_p.h pulls windows.h via 3rd party; prevent it from defining +// the min/max macros which would clash with qnumeric_p.h's usage of min()/max(). +#if defined(Q_OS_WIN32) && !defined(NOMINMAX) +# define NOMINMAX +#endif #include <QtTest/private/qbenchmark_p.h> #include <QtCore/qset.h> #include <QtCore/qmap.h> |