From 21e05c5ee7c3682c5284c5ea68e01b3ca4377438 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 25 Jun 2019 07:06:57 +0200 Subject: [PATCH] avoid deprecated calls --- examples/automotive/SpeedometerSkinlet.cpp | 2 +- examples/mycontrols/MySkin.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/automotive/SpeedometerSkinlet.cpp b/examples/automotive/SpeedometerSkinlet.cpp index 2ba55bba..4ed99c3a 100644 --- a/examples/automotive/SpeedometerSkinlet.cpp +++ b/examples/automotive/SpeedometerSkinlet.cpp @@ -145,7 +145,7 @@ QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, Q auto radius = static_cast< float >( panelRect.width() / 2 ); const QMarginsF numbersMargins = speedometer->marginsHint( Speedometer::Labels ); - QFontMetrics fontMetrics( speedometer->effectiveFont( Speedometer::Labels ) ); + QFontMetricsF fontMetrics( speedometer->effectiveFont( Speedometer::Labels ) ); auto angle = startAngle; qreal length = speedometer->metric( Speedometer::Labels | QskAspect::Size ); diff --git a/examples/mycontrols/MySkin.cpp b/examples/mycontrols/MySkin.cpp index d47464e3..88f2d599 100644 --- a/examples/mycontrols/MySkin.cpp +++ b/examples/mycontrols/MySkin.cpp @@ -120,19 +120,19 @@ class MySkin : public QskSkin { setBoxBorderMetrics( Q::Panel, 3 ); - auto light = QColor( baseColor ).light( 110 ); - auto dark = QColor( baseColor ).dark( 120 ); + auto light = QColor( baseColor ).lighter( 110 ); + auto dark = QColor( baseColor ).darker( 120 ); setBoxBorderColors( Q::Panel, QskBoxBorderColors( light, light, dark, dark ) ); } else { setBoxBorderMetrics( Q::Panel, 1 ); - setBoxBorderColors( Q::Panel, QColor( baseColor ).dark( 120 ) ); + setBoxBorderColors( Q::Panel, QColor( baseColor ).darker( 120 ) ); } setGradient( Q::Cursor, foregroundColor ); - setBoxBorderColors( Q::Cursor, QColor( foregroundColor ).dark( 120 ) ); + setBoxBorderColors( Q::Cursor, QColor( foregroundColor ).darker( 120 ) ); setBoxBorderMetrics( Q::Cursor, 1 ); for( auto subControl : { Q::Panel, Q::Cursor } )