diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-15 15:16:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-15 17:30:57 +0000 |
| commit | af6d4d068770db311e200c25513178b86bdf0e3b (patch) | |
| tree | e8952040af9dae3ce2710bed6eafbf71ba4bb7ab /src/testlib | |
| parent | d88c65a532e99c1a5b1482d4798e3b024859b0cf (diff) | |
Bring QTestPrivate::checkBlackLists() back
This change partially reverts 641eb4a965.
Task-number: QTBUG-71141
Change-Id: I423332cc89db4b8137e71fdd57798039d429d0d2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestblacklist_p.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index ee68328d33..84a99c10f3 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -259,7 +259,7 @@ void parseBlackList() } } -void checkBlackList(const char *slot, const char *data) +void checkBlackLists(const char *slot, const char *data) { bool ignore = ignoreAll; diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h index 67cd67b916..4522c64992 100644 --- a/src/testlib/qtestblacklist_p.h +++ b/src/testlib/qtestblacklist_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace QTestPrivate { // Export functions so they can also be used by QQuickTest Q_TESTLIB_EXPORT void parseBlackList(); - Q_TESTLIB_EXPORT void checkBlackList(const char *slot, const char *data); + Q_TESTLIB_EXPORT void checkBlackLists(const char *slot, const char *data); } QT_END_NAMESPACE diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index eb36645da9..ea147f1b0f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1103,7 +1103,7 @@ bool TestMethods::invokeTest(int index, const char *data, WatchDog *watchDog) co if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) { foundFunction = true; - QTestPrivate::checkBlackList(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : 0); + QTestPrivate::checkBlackLists(name.constData(), dataCount ? table.testData(curDataIndex)->dataTag() : 0); QTestDataSetter s(curDataIndex >= dataCount ? static_cast<QTestData *>(0) : table.testData(curDataIndex)); |