--===============2889213529647838564== Content-Type: multipart/signed; boundary="nextPart15959399.dgMJqSACLR"; micalg="pgp-sha256"; protocol="application/pgp-signature" --nextPart15959399.dgMJqSACLR Content-Type: multipart/mixed; boundary="nextPart2854892.AYqyXUST05"; protected-headers="v1" Content-Transfer-Encoding: 7Bit From: Laurent Montel To: gnupg-devel@gnupg.org Reply-To: montel@kde.org Cc: Ingo =?ISO-8859-1?Q?Kl=F6cker?= Subject: First patch for helping to build against qt6 Date: Mon, 04 Jul 2022 12:48:45 +0200 Message-ID: <1916681.hjKRzH8lug@localhost.localdomain> MIME-Version: 1.0 This is a multi-part message in MIME format. --nextPart2854892.AYqyXUST05 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Hi, This patch will help to build against qt6 We need to include vs using forward declaration Could you apply it please ? thanks -- Laurent Montel | laurent.montel@kdab.com | KDE/Qt Senior Software Engineer KDAB (France) S.A.S., a KDAB Group company Tel: France +33 (0)4 90 84 08 53, http://www.kdab.fr KDAB - The Qt, C++ and OpenGL Experts --nextPart2854892.AYqyXUST05 Content-Disposition: attachment; filename="include_qstringlist.diff" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="utf-8"; name="include_qstringlist.diff" commit 9c65b0743daac8d020bc610be9ba6bb4ce625d7f Author: Laurent Montel Date: Wed Jun 29 07:05:59 2022 +0200 qt: Add #include needed for building against qt6 Summary: * lang/qt/src/downloadjob.h, lang/qt/src/exportjob.h, lang/qt/src/keylistjob.h lang/qt/src/refreshkeysjob.h: in qt6 we need to use #include It fixes some compile qt6 compile error. Signed-off-by: Laurent Montel Test Plan: compile + launch test Differential Revision: https://dev.gnupg.org/D558 diff --git a/lang/qt/src/downloadjob.h b/lang/qt/src/downloadjob.h index 7c8bb725..b916c41d 100644 --- a/lang/qt/src/downloadjob.h +++ b/lang/qt/src/downloadjob.h @@ -38,6 +38,7 @@ #include "job.h" #include +#include #include @@ -46,7 +47,6 @@ namespace GpgME class Error; } -class QStringList; class QIODevice; class QByteArray; diff --git a/lang/qt/src/exportjob.h b/lang/qt/src/exportjob.h index 7f79ea08..4fdb468d 100644 --- a/lang/qt/src/exportjob.h +++ b/lang/qt/src/exportjob.h @@ -39,14 +39,13 @@ #include "job.h" #include +#include namespace GpgME { class Error; } -class QStringList; - namespace QGpgME { diff --git a/lang/qt/src/keylistjob.h b/lang/qt/src/keylistjob.h index 515a0e4d..ace9fbe0 100644 --- a/lang/qt/src/keylistjob.h +++ b/lang/qt/src/keylistjob.h @@ -44,6 +44,8 @@ # include #endif +#include + #include namespace GpgME @@ -52,8 +54,6 @@ class Error; class KeyListResult; } -class QStringList; - namespace QGpgME { diff --git a/lang/qt/src/refreshkeysjob.h b/lang/qt/src/refreshkeysjob.h index 6bd748ac..67774c2f 100644 --- a/lang/qt/src/refreshkeysjob.h +++ b/lang/qt/src/refreshkeysjob.h @@ -38,6 +38,8 @@ #include "job.h" #include "qgpgme_export.h" +#include + #include namespace GpgME @@ -46,8 +48,6 @@ class Error; class Key; } -class QStringList; - namespace QGpgME { --nextPart2854892.AYqyXUST05-- --nextPart15959399.dgMJqSACLR Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEE1fBm9jeOeCsED69sElIuu8uaeFMFAmLCxY4ACgkQElIuu8ua eFPIhQf/bYSsFXHusxw1ROXF1VKb1fehoAMN+0z5Ppllg0OCYyTUPG0qGuacA/Ap 0SVSj03iwobW056g5UczEoRUaQ7IpMiGTx+I7XEL3/ni0NS2ImxkdTWHT1ToRP0U Wvu+lhKkGRQLog1JLEg/XXxU/5Z8di5391i5T+nCAq3V2zyY71kyNi7vhaGfRf7G es9aJ7H9DJdA87/AcPQVCEKEgUz3ZFZWgBO5u7WXvu8a1pwKEY5nd6DlrtXL2kbe pDPm/g1YPh5rcLjvJsaEPdmvyajCgGSZCiTEathSDaAnYhK0WxWn3gG5fRL6F81a Xr4OzH+ySK9WrBsOH+dpQB//JbDUzw== =M3Bc -----END PGP SIGNATURE----- --nextPart15959399.dgMJqSACLR-- --===============2889213529647838564== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Gnupg-devel mailing list Gnupg-devel@lists.gnupg.org https://lists.gnupg.org/mailman/listinfo/gnupg-devel --===============2889213529647838564==--