Differential D19353

KMail: Fix compile with Qt 5.13 and QT_DISABLE_DEPRECATED_BEFORE=0x060000
ClosedPublic
Actions

Authored by marten on Feb 26 2019, 2:52 PM.

Details

Reviewers
dvratil
mlaurent
Group Reviewers
KDE PIM
Commits
R206:bc9bd293cdb3: Fix compile with Qt 5.13 and QT_DISABLE_DEPRECATED_BEFORE=0x060000
Summary

In this Qt version, obsolete functions and variables are now actually hidden in the header files if that compile definition is used.

QLayout::setMargin() -> setContentsMargins()
QDrag::start() -> QDrag::exec() with different default argument
QPalette::Background -> QPalette::Window
QMatrix -> QTransform
QPainter::drawRoundRect() -> drawRoundedRect()
QPainter::setMatrix() -> setWorldTransform()

Test Plan

Builds and runs correctly with Qt version 5.13.0.

Diff Detail

Repository
R206 KMail
Lint
Lint Skipped
Unit
Unit Tests Skipped
marten created this revision.Feb 26 2019, 2:52 PM
Restricted Application added a project: KDE PIM. · View Herald TranscriptFeb 26 2019, 2:52 PM
Restricted Application added a subscriber: kde-pim. · View Herald Transcript
marten requested review of this revision.Feb 26 2019, 2:52 PM
dvratil accepted this revision.Feb 26 2019, 5:02 PM
dvratil added a subscriber: dvratil.

Thanks for the whole patch set!

This revision is now accepted and ready to land.Feb 26 2019, 5:02 PM
mlaurent requested changes to this revision.Feb 27 2019, 6:56 AM
mlaurent added a subscriber: mlaurent.
mlaurent added inline comments.
ktnef/src/qwmf.cpp
574

it's wrong see:
void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd)
{

drawRoundedRect(r, xRnd, yRnd, Qt::RelativeSize);

}

but

void drawRoundedRect(const QRectF &rect, qreal xRadius, qreal yRadius,
                     Qt::SizeMode mode = Qt::AbsoluteSize);

> you use 2 differents sizemode

This revision now requires changes to proceed.Feb 27 2019, 6:56 AM
marten updated this revision to Diff 52705.Feb 27 2019, 9:22 AM
marten marked an inline comment as done.

Thanks for spotting this, diff updated to use Qt::RelativeSize

mlaurent accepted this revision.Feb 27 2019, 12:17 PM
This revision is now accepted and ready to land.Feb 27 2019, 12:17 PM
Closed by commit R206:bc9bd293cdb3: Fix compile with Qt 5.13 and QT_DISABLE_DEPRECATED_BEFORE=0x060000 (authored by marten). · Explain WhyFeb 27 2019, 3:58 PM
This revision was automatically updated to reflect the committed changes.

Showing Only Differences

This revision modifies 29 more files that are hidden because they were not modified between selected diffs and they have no inline comments.

Revision Contents
Changeset List

PathPackages
Mktnef/src/qwmf.cpp (29 lines)
Msrc/editor/kmcomposerwin.cpp (4 lines)
Msrc/kmsystemtray.h (1 line)

Diff 52705

View Options

ktnef/src/qwmf.cpp

Loading...
View Options

src/editor/kmcomposerwin.cpp

Loading...
View Options

src/kmsystemtray.h

Loading...