GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Fix build against Qt 5.9

Browse Source 
* 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
This commit is contained in:
Ingo Klöcker 2021-09-13 17:30:49 +02:00
parent aaf448b1e8
commit ab9bca09eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/qt/tests/t-keylist.cpp
View File

@ -151,7 +151,7 @@ private Q_SLOTS:
delete job; delete job;
QVERIFY(!result.error()); 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); std::vector<std::string> secKeyFingerprints = std::accumulate(secKeys.begin(), secKeys.end(), std::vector<std::string>(), accumulateFingerprints);
QCOMPARE(secKeyFingerprints, std::vector<std::string>({ QCOMPARE(secKeyFingerprints, std::vector<std::string>({
"23FD347A419429BACCD5E72D6BC4778054ACD246", "23FD347A419429BACCD5E72D6BC4778054ACD246",
@ -162,7 +162,7 @@ private Q_SLOTS:
QVERIFY(secKeys[0].subkeys()[0].keyGrip()); 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); std::vector<std::string> pubKeyFingerprints = std::accumulate(pubKeys.begin(), pubKeys.end(), std::vector<std::string>(), accumulateFingerprints);
QCOMPARE(pubKeyFingerprints, std::vector<std::string>({ QCOMPARE(pubKeyFingerprints, std::vector<std::string>({
"045B2334ADD69FC221076841A5E67F7FA3AE3EA1", "045B2334ADD69FC221076841A5E67F7FA3AE3EA1",

2
lang/qt/tests/t-various.cpp
View File

@ -230,7 +230,7 @@ private Q_SLOTS:
std::vector<Subkey> primaryKey; std::vector<Subkey> primaryKey;
primaryKey.push_back(key.subkey(0)); primaryKey.push_back(key.subkey(0));
const auto err = ctx->setExpire(key, 3000, primaryKey); 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; delete ctx;
} }