[prev in list] [next in list] [prev in thread] [next in thread]
List: gnupg-devel
Subject: First patch for helping to build against qt6
From: Laurent Montel <montel () kde ! org>
Date: 2022-07-04 10:48:45
Message-ID: 1916681.hjKRzH8lug () localhost ! localdomain
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
Hi,
This patch will help to build against qt6
We need to include <QStringList> 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
["include_qstringlist.diff" (include_qstringlist.diff)]
commit 9c65b0743daac8d020bc610be9ba6bb4ce625d7f
Author: Laurent Montel <montel@kde.org>
Date: Wed Jun 29 07:05:59 2022 +0200
qt: Add #include <QStringList> 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 <QStringList>
It fixes some compile qt6 compile error.
Signed-off-by: Laurent Montel <montel@kde.org>
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 <QtCore/QByteArray>
+#include <QtCore/QStringList>
#include <memory>
@@ -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 <QtCore/QByteArray>
+#include <QtCore/QStringList>
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 <gpgme++/key.h>
#endif
+#include <QtCore/QStringList>
+
#include <vector>
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 <QtCore/QStringList>
+
#include <vector>
namespace GpgME
@@ -46,8 +48,6 @@ class Error;
class Key;
}
-class QStringList;
-
namespace QGpgME
{
["signature.asc" (application/pgp-signature)]
_______________________________________________
Gnupg-devel mailing list
Gnupg-devel@lists.gnupg.org
https://lists.gnupg.org/mailman/listinfo/gnupg-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic