forked from pool/kruler
This commit is contained in:
parent
235240226a
commit
1005d103c3
46
0001-Make-it-compiles-without-deprecated-method.patch
Normal file
46
0001-Make-it-compiles-without-deprecated-method.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laurent Montel <montel@kde.org>
|
||||||
|
Date: Wed, 18 Sep 2019 06:41:34 +0200
|
||||||
|
Subject: [PATCH] Make it compiles without deprecated method
|
||||||
|
|
||||||
|
---
|
||||||
|
klineal.cpp | 8 +++-----
|
||||||
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/klineal.cpp b/klineal.cpp
|
||||||
|
index 8b5d3c3..0f9bc48 100644
|
||||||
|
--- a/klineal.cpp
|
||||||
|
+++ b/klineal.cpp
|
||||||
|
@@ -705,7 +705,7 @@ void KLineal::mouseReleaseEvent( QMouseEvent *inEvent )
|
||||||
|
|
||||||
|
void KLineal::wheelEvent( QWheelEvent *e )
|
||||||
|
{
|
||||||
|
- int numDegrees = e->delta() / 8;
|
||||||
|
+ int numDegrees = e->angleDelta().y() / 8;
|
||||||
|
int numSteps = numDegrees / 15;
|
||||||
|
|
||||||
|
// changing offset
|
||||||
|
@@ -756,8 +756,7 @@ void KLineal::drawScale( QPainter &painter )
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( digit % 100 == 0 && digit != 0 ) {
|
||||||
|
- QString units;
|
||||||
|
- units.sprintf( "%d", digit );
|
||||||
|
+ QString units = QStringLiteral("%1").arg(digit);
|
||||||
|
drawScaleText( painter, x, units );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -771,9 +770,8 @@ void KLineal::drawScale( QPainter &painter )
|
||||||
|
int x = (int)( i * step );
|
||||||
|
|
||||||
|
if ( i % 10 == 0 && i != 0 && i != 100 ) {
|
||||||
|
- QString units;
|
||||||
|
int value = mLeftToRight ? i : ( 100 - i );
|
||||||
|
- units.sprintf( "%d%%", value );
|
||||||
|
+ const QString units = QString::asprintf( "%d%%", value );
|
||||||
|
drawScaleText( painter, x, units );
|
||||||
|
len = MEDIUM2_TICK_SIZE;
|
||||||
|
} else {
|
||||||
|
--
|
||||||
|
2.24.0
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 14 10:08:31 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add 0001-Make-it-compiles-without-deprecated-method.patch to fix build with Qt 5.14.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 7 23:13:18 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
Thu Nov 7 23:13:18 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
|
||||||
|
|
||||||
|
@ -32,6 +32,8 @@ Source: https://download.kde.org/stable/applications/%{version}/src/%{na
|
|||||||
Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||||
Source2: applications.keyring
|
Source2: applications.keyring
|
||||||
%endif
|
%endif
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
%patch0: 0001-Make-it-compiles-without-deprecated-method.patch
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: kdoctools-devel
|
BuildRequires: kdoctools-devel
|
||||||
BuildRequires: ki18n-devel
|
BuildRequires: ki18n-devel
|
||||||
@ -57,7 +59,7 @@ A screen ruler for the K Desktop Environment
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user