diff options
| author | Ingo Klöcker <[email protected]> | 2021-09-13 15:30:49 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-09-13 15:30:49 +0000 |
| commit | ab9bca09eb869b2013c85fee232f1e62aed925f6 (patch) | |
| tree | 3f77665992c45f0d272141ba94af0e15146c3a2b | |
| parent | build: Fix make distcheck problem. (diff) | |
| download | gpgme-ab9bca09eb869b2013c85fee232f1e62aed925f6.tar.gz gpgme-ab9bca09eb869b2013c85fee232f1e62aed925f6.zip | |
qt: Fix build against Qt 5.9
* lang/qt/tests/t-keylist.cpp (KeyListTest::testListAllKeysSync):
Ensure same type for both arguments of QCOMPARE.
* lang/qt/tests/t-various.cpp (TestVarious::testSetExpire):
Ensure same type for both arguments of QCOMPARE.
--
Qt 5.9 does not yet have the generic qCompare helper which supports
arguments of any type that can be compared with ==.
GnuPG-bug-id: 5592
| -rw-r--r-- | lang/qt/tests/t-keylist.cpp | 4 | ||||
| -rw-r--r-- | lang/qt/tests/t-various.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp index 5875dfb4..dddcb738 100644 --- a/lang/qt/tests/t-keylist.cpp +++ b/lang/qt/tests/t-keylist.cpp @@ -151,7 +151,7 @@ private Q_SLOTS: delete job; QVERIFY(!result.error()); - QCOMPARE(secKeys.size(), 2u); + QCOMPARE(secKeys.size(), static_cast<decltype(secKeys.size())>(2)); std::vector<std::string> secKeyFingerprints = std::accumulate(secKeys.begin(), secKeys.end(), std::vector<std::string>(), accumulateFingerprints); QCOMPARE(secKeyFingerprints, std::vector<std::string>({ "23FD347A419429BACCD5E72D6BC4778054ACD246", @@ -162,7 +162,7 @@ private Q_SLOTS: QVERIFY(secKeys[0].subkeys()[0].keyGrip()); } - QCOMPARE(pubKeys.size(), 26u); + QCOMPARE(pubKeys.size(), static_cast<decltype(pubKeys.size())>(26)); std::vector<std::string> pubKeyFingerprints = std::accumulate(pubKeys.begin(), pubKeys.end(), std::vector<std::string>(), accumulateFingerprints); QCOMPARE(pubKeyFingerprints, std::vector<std::string>({ "045B2334ADD69FC221076841A5E67F7FA3AE3EA1", diff --git a/lang/qt/tests/t-various.cpp b/lang/qt/tests/t-various.cpp index 72a2487a..dca34d30 100644 --- a/lang/qt/tests/t-various.cpp +++ b/lang/qt/tests/t-various.cpp @@ -230,7 +230,7 @@ private Q_SLOTS: std::vector<Subkey> primaryKey; primaryKey.push_back(key.subkey(0)); const auto err = ctx->setExpire(key, 3000, primaryKey); - QCOMPARE(err.code(), GPG_ERR_NOT_FOUND); + QCOMPARE(err.code(), static_cast<int>(GPG_ERR_NOT_FOUND)); delete ctx; } |