From 40f4b3de1a7dc8fdce26893880f2d4ca962cf966 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 20 Mar 2020 02:29:14 +0100 Subject: [PATCH] qeasingcurve/tst_qeasingcurve: Fix for MinGW 8.1 x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test fails on MinGW 8.1 x86, but not on MinGW 8.1 x86_64. Task-number: QTQAINFRA-3304 Task-number: QTBUG-69947 Change-Id: Ie9a35bd6d5a8481028cd0ea426d1cf00bd7cf093 Reviewed-by: Tony Sarajärvi Reviewed-by: Friedemann Kleint --- tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp index 2a9c1e1e41..898ac86874 100644 --- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp +++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp @@ -428,9 +428,9 @@ void tst_QEasingCurve::setCustomType() QCOMPARE(curve.valueForProgress(0.15), 0.1); QCOMPARE(curve.valueForProgress(0.20), 0.2); QCOMPARE(curve.valueForProgress(0.25), 0.2); - // QTBUG-69947, MinGW 7.3 returns 0.2 + // QTBUG-69947, MinGW 7.3, 8.1 x86 returns 0.2 #if defined(Q_CC_MINGW) -#if !defined(__GNUC__) || __GNUC__ != 7 || __GNUC_MINOR__ < 3 +#if !defined(__GNUC__) || defined(__MINGW64__) QCOMPARE(curve.valueForProgress(0.30), 0.3); #endif #endif