summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-27 13:41:12 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-27 13:41:12 (GMT)
commitd094e377dc78bf7107d25e74b8977b355709541c (patch)
treea8d0414a22dd93b317ac4bf5e8643cbdc018d013
parenteef771a4f967513045e13faaedd0864cacffc847 (diff)
Normalize default/dummy sans serif font name to "Sans Serif"
-rw-r--r--src/lib/marble/ClipPainter.cpp2
-rw-r--r--src/lib/marble/MergedLayerDecorator.cpp2
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/marble/ClipPainter.cpp b/src/lib/marble/ClipPainter.cpp
index 2250fcb..b283793 100644
--- a/src/lib/marble/ClipPainter.cpp
+++ b/src/lib/marble/ClipPainter.cpp
@@ -1227,7 +1227,7 @@ void ClipPainterPrivate::debugDrawNodes( const QPolygonF & polygon )
q->drawRect( itPoint->x() - 4, itPoint->y() - 4 , 8.0, 8.0 );
}
if (m_debugPolygonsLevel == 2) {
- q->setFont(QFont("Helvetica", 7));
+ q->setFont(QFont(QStringLiteral("Sans Serif"), 7));
q->setPen("black");
q->drawText(itPoint->x() + 6.0, itPoint->y() + (15 - (i * 5) % 30) , QString::number(i));
}
diff --git a/src/lib/marble/MergedLayerDecorator.cpp b/src/lib/marble/MergedLayerDecorator.cpp
index 3755e7c..ff168b3 100644
--- a/src/lib/marble/MergedLayerDecorator.cpp
+++ b/src/lib/marble/MergedLayerDecorator.cpp
@@ -533,7 +533,7 @@ void MergedLayerDecorator::Private::paintTileId( QImage *tileImage, const TileId
painter.drawRect( strokeWidth / 2, strokeWidth / 2,
tileImage->width() - strokeWidth,
tileImage->height() - strokeWidth );
- QFont testFont( "Sans", 12 );
+ QFont testFont(QStringLiteral("Sans Serif"), 12);
QFontMetrics testFm( testFont );
painter.setFont( testFont );
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 1dc5c5a..1fce598 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -270,7 +270,7 @@ QVector<const GeoDataFeature*> PlacemarkLayout::whichPlacemarkAt( const QPoint&
int PlacemarkLayout::maxLabelHeight() const
{
- QFont const standardFont(QStringLiteral("Arial"));
+ QFont const standardFont(QStringLiteral("Sans Serif"));
return QFontMetrics(standardFont).height();
}