whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amend 7f77dc84fb to simplify the parameters of createPlainTestRows 

Change-Id: I61370a46722f729ea53cb365eab556a97ec5ee7b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Lars Schmertmann 2018-11-06 18:41:08 +01:00 committed by Lars Schmertmann
parent de83447830
commit 079df681ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
View File

@ -63,7 +63,7 @@ class tst_QSslKey : public QObject
QList<KeyInfo> keyInfoList;
void createPlainTestRows(bool filter = false, QSsl::EncodingFormat format = QSsl::EncodingFormat::Pem);
void createPlainTestRows(bool pemOnly = false);
public slots:
void initTestCase();
@ -155,7 +155,7 @@ Q_DECLARE_METATYPE(QSsl::KeyAlgorithm)
Q_DECLARE_METATYPE(QSsl::KeyType)
Q_DECLARE_METATYPE(QSsl::EncodingFormat)
void tst_QSslKey::createPlainTestRows(bool filter, QSsl::EncodingFormat format)
void tst_QSslKey::createPlainTestRows(bool pemOnly)
{
QTest::addColumn<QString>("absFilePath");
QTest::addColumn<QSsl::KeyAlgorithm>("algorithm");
@ -163,7 +163,7 @@ void tst_QSslKey::createPlainTestRows(bool filter, QSsl::EncodingFormat format)
QTest::addColumn<int>("length");
QTest::addColumn<QSsl::EncodingFormat>("format");
foreach (KeyInfo keyInfo, keyInfoList) {
if (filter && keyInfo.format != format)
if (pemOnly && keyInfo.format != QSsl::EncodingFormat::Pem)
continue;
#ifdef Q_OS_WINRT
if (keyInfo.fileInfo.fileName().contains("RC2-64"))