Add a '5' to adjust defines
ClosedPublic
Actions

Authored by heirecka on Mar 18 2024, 9:28 PM.

Details

Reviewers

TobiasFella
• werner
ikloecker

Commits

rP844360c9c99d: qt5: Add a '5' to adjust defines

Summary

They were changed from PINENTRY_QT_FOO to PINENTRY_QT5_FOO in
1e79123c389584b8240387914b193be41b823e92.

Test Plan

Built with Qt5, KF5Wayland and X11 were linked again.

Diff Detail

Repository

rP Pinentry

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

heirecka requested review of this revision.Mar 18 2024, 9:28 PM

heirecka created this revision.

Grr. That's why I'm only using #if DEFINE01 in Kleopatra so that undefined defines don't go unnoticed. (Update: And I just noticed that this doesn't actually work because, apparently, any undefined identifier is replace by 0 when evaluating conditional expressions.)

This revision is now accepted and ready to land.Mar 18 2024, 10:31 PM

thesamesam added a subscriber: thesamesam.Mar 19 2024, 9:55 AM

Thanks! Applied.

ikloecker added a commit: rP844360c9c99d: qt5: Add a '5' to adjust defines.Mar 19 2024, 10:17 AM

New release due?

Let's wait a few days before we do a patch release. The missing CAPS lock indicator isn't mission critical.

@heirecka The changes were applied. Please close this MR. (Unfortunately, only the author can close patches.)

heirecka closed this revision.Mon, Apr 8, 10:07 AM