summaryrefslogtreecommitdiffstats
path: root/tests/auto/integrationtests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-28 14:32:24 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-28 09:33:29 +0200
commitf2f4115235d626f0f9523ae49b40f2c52eced170 (patch)
treec4a1d4f08b7fe2f03875d4a810896f6930b13b52 /tests/auto/integrationtests
parent4d643a0614c990742462d7435fd16142fd428252 (diff)
Remove redundant preprocessor directive.
In Qt5, it's quite safe to assume that QT_VERSION is greater than 4.x. Change-Id: I2b7f491d79e084f3a52ee54c9e97419570b57584 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/integrationtests')
-rw-r--r--tests/auto/integrationtests/lancelot/paintcommands.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/integrationtests/lancelot/paintcommands.cpp b/tests/auto/integrationtests/lancelot/paintcommands.cpp
index 9659659973..dc23575fc5 100644
--- a/tests/auto/integrationtests/lancelot/paintcommands.cpp
+++ b/tests/auto/integrationtests/lancelot/paintcommands.cpp
@@ -1948,15 +1948,11 @@ void PaintCommands::command_setFont(QRegExp re)
QFont font(family, size, weight, italic);
-#if QT_VERSION >= 0x040800
int hinting = translateEnum(fontHintingTable, caps.at(5), 4);
if (hinting == -1)
hinting = 0;
else
font.setHintingPreference(QFont::HintingPreference(hinting));
-#else
- int hinting = 1;
-#endif
if (m_verboseMode)
printf(" -(lance) setFont(family=%s, size=%d, weight=%d, italic=%d hinting=%s\n",
qPrintable(family), size, weight, italic, fontHintingTable[hinting]);
@@ -2306,11 +2302,7 @@ void PaintCommands::command_gradient_setRadialExtended(QRegExp re)
"focal radius=%.2f, spread=%d\n",
cx, cy, rad, fx, fy, frad, m_gradientSpread);
-#if QT_VERSION >= 0x040800
QRadialGradient rg(QPointF(cx, cy), rad, QPointF(fx, fy), frad);
-#else
- QRadialGradient rg(QPointF(cx, cy), rad, QPointF(fx, fy));
-#endif
rg.setStops(m_gradientStops);
rg.setSpread(m_gradientSpread);
rg.setCoordinateMode(m_gradientCoordinate);