gpgme/lang/qt, branch ikloecker/qt6GnuPG Made Easy.http://git.bktus.com/gpgfrontend/gpgme/atom?h=ikloecker%2Fqt62022-10-11T09:00:15Zbuild,qt: Clean up all generated files2022-10-11T09:00:15ZIngo Klöckerdev@ingo-kloecker.de2022-10-11T08:44:24Zurn:sha1:e6a1b241b4e6a0a677ed8f0e4e287a5cc82d7fbb
* lang/qt/src/Makefile.am (CLEANFILES): Add QGpgmeConfig-w32.cmake.in
and QGpgmeQt6Config-w32.cmake.in.
--
qt,tests: Port test to QRegularExpression.2022-10-11T09:00:15ZIngo Klöckerdev@ingo-kloecker.de2022-10-11T08:23:36Zurn:sha1:b2fb26baeada7b39331f71a30c654bfb8b53cb30
* lang/qt/tests/t-trustsignatures.cpp: Use QRegularExpression instead of
QRegExp.
--
This allows building with Qt 6 without Core5Compat.
qt: Remove obsolete code.2022-10-11T09:00:15ZIngo Klöckerdev@ingo-kloecker.de2022-10-11T08:19:37Zurn:sha1:4938c24a466bf05e707d3e6cbf759705adc7e8d6
* lang/qt/src/qgpgmenewcryptoconfig.cpp (struct Select1St): Remove.
--
This struct was never used in this implementation of the crypto config
classes and it causes a build error with Qt 6 where QPair is an alias
for std::pair.
build,qt: Allow building QGpgME for Qt 62022-10-11T09:00:14ZIngo Klöckerdev@ingo-kloecker.de2022-10-11T08:14:53Zurn:sha1:8d019bbb8d40de2cbed7ad6d3367c6a46a561fab
* configure.ac: Look for Qt 5 and/or Qt 6. Require C++17 if Qt 6 binding
is built. Build cmake files QGpgmeConfig* for Qt 5 and QGpgmeQt6Config*
for Qt 6.
(available_languages): Add "qt5" and "qt6".
(WANT_QT5, WANT_QT6): New conditionals.
* lang/qt/src/Makefile.am: Keep building libqgpgme for Qt 5. Build
libqgpgmeqt6 for Qt 6.
* lang/qt/tests/Makefile.am: Build tests for Qt 5 or Qt 6.
* lang/qt/src/QGpgmeQt6Config-w32.cmake.in.in,
lang/qt/src/QGpgmeQt6Config.cmake.in.in,
lang/qt/src/QGpgmeQt6ConfigVersion.cmake.in, m4/qt6.m4: New.
--
This makes it possible to build QGpgME optionally for Qt 6.4.0 or later.
By default or if the language "qt" is enabled, then QGpgME is built
either for Qt 5 (if found) or Qt 6. A build for Qt 5 or Qt 6 can be
requested by explicitly enabling the language "qt5" or "qt6". Building
QGpgME for Qt 5 and Qt 6 simultaneously is not supported.
build,qt: Explicitly namespace a few Qt variables for Qt52022-10-10T12:46:39ZIngo Klöckerdev@ingo-kloecker.de2022-10-10T12:30:41Zurn:sha1:8e908029ffa03d21662030d3111dcf556b722e1a
m4/qt.m4: Rename to
m4/qt5.m4: this.
(FIND_QT): Rename to FIND_QT5.
(GPGME_QT): Change variable prefix to GPGME_QT5.
(GPGME_QTTEST: Change variable prefix to GPGME_QT5TEST.
configure.ac, lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am:
Adjust accordingly.
--
In preparation to adding support for building qgpgme for Qt6, add the
version number to a few variables to avoid confusion.
qt: Fix building with C++112022-08-22T12:39:22ZIngo Klöckerdev@ingo-kloecker.de2022-08-22T12:39:22Zurn:sha1:83176ad7d3e57ad7804d3c885e1b4fcd1d4d96f9
* lang/qt/src/qgpgmerefreshsmimekeysjob.cpp
(QGpgMERefreshSMIMEKeysJob::start): Replace 'auto' in lambda with the
actual type.
* lang/qt/src/qgpgmesignkeyjob.cpp (class TrustSignatureProperties): Add
default c'tor and c'tor initializing all members.
* lang/qt/src/util.cpp (toFingerprints): Replace 'auto' in lambda with
the actual type.
* lang/qt/tests/run-exportjob.cpp (createExportJob): Replace 'auto'
return type with actual type.
--
This fixes compilation with strict C++11.
GnuPG-bug-id: 6141
qt: Fix building with Qt62022-08-22T07:30:14ZIngo Klöckerdev@ingo-kloecker.de2022-08-22T07:30:14Zurn:sha1:05661806848b8a6ef9005e4a420d8613ddc868f1
* lang/qt/src/util.cpp, lang/qt/src/util.h: Replace forward declaration
with include.
--
Based on patch by Laurent Montel
qt,tests: Make test pass on 32-bit systems2022-08-18T08:55:09ZIngo Klöckerdev@ingo-kloecker.de2022-08-18T08:55:09Zurn:sha1:2e7a61b898fccc1c20000b79dee83cd980901fa9
* lang/qt/tests/t-addexistingsubkey.cpp
(AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Handle
negative expiration date.
--
On 32-bit systems the expiration date of the test key overflows. This
will cause the AddExistingSubkeyJob to fail. We expect it to fail with
an "invalid time" error.
GnuPG-bug-id: 6137
qt,tests: Make sure expiration time is interpreted as unsigned number2022-08-17T13:22:29ZIngo Klöckerdev@ingo-kloecker.de2022-08-17T13:22:29Zurn:sha1:f2b48de26b8f8c48c293423eda712831544924f6
* lang/qt/tests/t-addexistingsubkey.cpp,
lang/qt/tests/t-changeexpiryjob.cpp: Convert expiration time to
uint_least32_t.
--
This doesn't change the outcome of the tests (they also pass without
this change because of the expiration dates of the test keys), but it's
still good practise to treat the expiration time as an unsigned number
if the assertions check that the expiration time is in some range.
GnuPG-bug-id: 6137
qt,tests: Log the actual error code if the assertion fails2022-08-17T12:56:13ZIngo Klöckerdev@ingo-kloecker.de2022-08-17T12:56:13Zurn:sha1:81d4b7f2d7077297d76af5728949d8f2bdff8cd5
* lang/qt/tests/t-addexistingsubkey.cpp (
AddExistingSubkeyJobTest::testAddExistingSubkeyAsync,
AddExistingSubkeyJobTest::testAddExistingSubkeySync,
AddExistingSubkeyJobTest::testAddExistingSubkeyWithExpiration): Use
QCOMPARE instead of QVERIFY for asserting equality.
--
GnuPG-bug-id: 6137