Page MenuHome GnuPG

qt: Split off Qt5 frontend and port existing backend to Qt6
ClosedPublic

Authored by TobiasFella on Jan 15 2024, 4:35 PM.

Details

Reviewers
ikloecker
Summary
  • Makefile.am: Add new backend.
  • configure.ac: Configure desktop file for Qt5 backend.
  • doc/pinentry.texi: Add Qt6 backend to docs.
  • m4/qt6.m4: New.
  • qt/Makefile.am: Use Qt6 instead of Qt5.
  • qt/capslock.cpp, qt/capslock_p.h, qt/capslock_unix.cpp:

Port capslock detection from KWayland to KGuiAddons.

  • qt/pinentryconfirm.cpp: Adapt to changed function signature.
  • qt5/*: Copy from qt/ and rename. --

The only noteworthy change is porting from KWayland to KGuiAddons for capslock detection, the rest is copy&paste, s/qt/qt5, s/qt5/qt6, etc.

Test Plan

compile with and without kguiaddons (needs https://invent.kde.org/frameworks/kguiaddons/-/merge_requests/113); check that qt5 and qt6 dialogs work, check that capslock detection on wayland/x11 works

Diff Detail

Repository
rP Pinentry
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

TobiasFella created this revision.

Looks good except for one thing. There's also a deprecation warning, but let's fix this with the next commit.

configure.ac
643

Adding -fpic shouldn't be needed or may even be wrong. qt6.m4 already adds -fPIC if required.

This revision is now accepted and ready to land.Jan 16 2024, 9:03 AM
TobiasFella marked an inline comment as done.