Differential D7533

[fix] only use horizontalAdvance for Qt versions which support it
ClosedPublic
Actions

Authored by majcosta on Sep 23 2020, 00:54.

Tags

None

Subscribers

Details

Reviewers

deadalnix
Fabien

Group Reviewers

Restricted Project

Commits

rABC131a31b642fa: [fix] only use horizontalAdvance for Qt versions which support it

Summary

Our cross-builds build against Qt 5.10.x or lower and were broken by D7524:

[00:44:34][Step 1/1] ../../src/qt/guiutil.cpp: In function ‘qreal GUIUtil::calculateIdealFontSize(int, const QString&, QFont, qreal, qreal)’:
[00:44:34][Step 1/1] ../../src/qt/guiutil.cpp:957:16: error: ‘class QFontMetrics’ has no member named ‘horizontalAdvance’
[00:44:34][Step 1/1]          if (fm.horizontalAdvance(text) < width) {
[00:44:34][Step 1/1]                 ^~~~~~~~~~~~~~~~~

This diff fixes that ~~without an additional preprocessor conditional block~~

Test Plan

ninja
bitcoin-qt -regtest

Check if receive tab shows everything right

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

majcosta created this revision.Sep 23 2020, 00:54

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 23 2020, 00:54

majcosta requested review of this revision.Sep 23 2020, 00:54

Harbormaster completed remote builds in B12876: Diff 23717.Sep 23 2020, 01:09

An explanation of what the problem is and how this fixes it would be nice.

This revision now requires changes to proceed.Sep 23 2020, 01:21

Yes, I broke our cross-builds with D7524 which apparently build against Qt 5.10.x or lower. This diff corrects that.

https://build.bitcoinabc.org/viewLog.html?tab=buildLog&logTab=tree&filter=debug&expand=all&buildId=62975&_focus=2126

majcosta edited the summary of this revision. (Show Details)Sep 23 2020, 01:58

majcosta edited the summary of this revision. (Show Details)

wait a minute...

now it's fixed

majcosta edited the summary of this revision. (Show Details)Sep 23 2020, 02:18

Harbormaster completed remote builds in B12877: Diff 23718.Sep 23 2020, 02:29

Fabien accepted this revision.Sep 23 2020, 06:12

deadalnix accepted this revision.Sep 23 2020, 12:46

This revision is now accepted and ready to land.Sep 23 2020, 12:46

Closed by commit rABC131a31b642fa: [fix] only use horizontalAdvance for Qt versions which support it (authored by majcosta). · Explain WhySep 23 2020, 12:50

This revision was automatically updated to reflect the committed changes.

majcosta added a commit: rABC131a31b642fa: [fix] only use horizontalAdvance for Qt versions which support it.

Revision Contents
Changeset List

Path

Size

src/

qt/

2 lines

Diff 23728

src/qt/guiutil.cpp

Loading...