AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qgraphicsview autotest build for WEC7.

Browse Source 
logicalDotsPerInchX returns qreal, and qreal in WEC7 is defined to
float instead  double. There is no required overload:
    qFuzzyCompare(float,double)
And for that reason build fails. Ensure qreal is casted to double which
is default type used by compilers for floating point literals such as
'96.0'.

Change-Id: I24c701715b3dcf1a2137256a1c251c19d0c1dbe9
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
This commit is contained in:
Janne Anttila 2013-04-17 16:05:24 +03:00 committed by The Qt Project
parent c6612de314
commit 453e4da6d1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
View File

@ -661,7 +661,7 @@ void _scrollBarRanges_data()
} }
const QScreen *screen = QGuiApplication::primaryScreen(); const QScreen *screen = QGuiApplication::primaryScreen();
if (screen && qFuzzyCompare(screen->logicalDotsPerInchX(), 96.0)) { if (screen && qFuzzyCompare((double)screen->logicalDotsPerInchX(), 96.0)) {
_scrollBarRanges_addTestData(QString("motif"), false); _scrollBarRanges_addTestData(QString("motif"), false);
_scrollBarRanges_addTestData(QString("motif"), true); _scrollBarRanges_addTestData(QString("motif"), true);
} }