From 28292170d8c02743cabfabba3a1623b8d71b9aa2 Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Sat, 8 Jul 2023 01:38:33 +0200 Subject: Port to (and require) Qt 5.15. Drop KDE4 support, fix KDE5 (#2541) * Port to (and require) Qt 5.15. Drop KDE4 support, implement KDE5 support where needed. --------- Co-authored-by: Fabio Bas --- src/modules/objects/KvsObject_painter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/objects/KvsObject_painter.cpp') diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index 4918253d3..0b425d38b 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -887,7 +887,7 @@ KVSO_CLASS_FUNCTION(painter, drawRoundRect) KVSO_PARAMETERS_END(c) QString function = "$drawRoundRect"; KVSO_PARAMETERS_PAINTER(pXOrArray, iY, iW, iH) - m_pPainter->drawRoundRect(iX, iY, iW, iH, iXrnd, iYrnd); + m_pPainter->drawRoundedRect(iX, iY, iW, iH, iXrnd, iYrnd); return true; } @@ -1140,7 +1140,7 @@ KVSO_CLASS_FUNCTION(painter, fontMetricsWidth) KVSO_PARAMETER("text", KVS_PT_STRING, 0, szText) KVSO_PARAMETERS_END(c) if(m_pPainter->isActive()) - c->returnValue()->setInteger(m_pPainter->fontMetrics().width(szText)); + c->returnValue()->setInteger(m_pPainter->fontMetrics().horizontalAdvance(szText)); else c->warning(__tr2qs_ctx("$fontMetricsWidth: the painter is not active!", "objects")); return true; @@ -1193,7 +1193,7 @@ KVSO_CLASS_FUNCTION(painter, begin) QPrintDialog printDialog(m_pPrinter, nullptr); if(printDialog.exec() == QDialog::Accepted) { - qDebug("papersize %d", m_pPrinter->paperSize()); + qDebug("papersize %d", m_pPrinter->pageLayout().pageSize().id()); m_pPainter->begin(m_pPrinter); return true; } -- cgit v1.3.1-10-gc9f91