summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting/qcolor
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-17 13:24:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-17 21:28:11 +0100
commit34304e3100883187ca658b8c983af21549496b43 (patch)
tree5c2e8216740e4ad4e9efc6010539c3a6cfbbbf8e /tests/auto/gui/painting/qcolor
parent1e9dc3ec2f254c711149f8c0376f0403df9b4650 (diff)
Get rid of Q_COMPILER_CONSTEXPR checks
Is required now. Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/gui/painting/qcolor')
-rw-r--r--tests/auto/gui/painting/qcolor/tst_qcolor.cpp4
1 files changed, 0 insertions, 4 deletions
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<QColor>("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))