From f2f4115235d626f0f9523ae49b40f2c52eced170 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 28 Oct 2011 14:32:24 +1000 Subject: [PATCH] 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 --- tests/auto/integrationtests/lancelot/paintcommands.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/auto/integrationtests/lancelot/paintcommands.cpp b/tests/auto/integrationtests/lancelot/paintcommands.cpp index 9659659..dc23575 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); -- 2.7.4