From 34304e3100883187ca658b8c983af21549496b43 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 17 Nov 2020 13:24:46 +0100 Subject: Get rid of Q_COMPILER_CONSTEXPR checks Is required now. Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349 Reviewed-by: Lars Knoll --- tests/auto/gui/painting/qcolor/tst_qcolor.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp index b9ae7a258b..40d42806a8 100644 --- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp +++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp @@ -64,10 +64,8 @@ private slots: void globalColors_data(); void globalColors(); -#if defined(Q_COMPILER_CONSTEXPR) & defined(Q_COMPILER_UNIFORM_INIT) void colorConstants_data(); void colorConstants(); -#endif void setRed(); void setGreen(); @@ -373,7 +371,6 @@ void tst_QColor::globalColors() QCOMPARE(color.rgba(), argb); } -#if defined(Q_COMPILER_CONSTEXPR) & defined(Q_COMPILER_UNIFORM_INIT) void tst_QColor::colorConstants_data() { QTest::addColumn("color"); @@ -556,7 +553,6 @@ void tst_QColor::colorConstants() QFETCH(QRgb, argb); QCOMPARE(color.rgba(), argb); } -#endif // defined(Q_COMPILER_CONSTEXPR) & defined(Q_COMPILER_UNIFORM_INIT) /* CSS color names = SVG 1.0 color names + transparent (rgba(0,0,0,0)) -- cgit v1.2.3