diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-11 08:24:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-11 08:25:04 +0100 |
| commit | d456f87ece0323982b7601047712545ab95426ad (patch) | |
| tree | 46b90468b01144615f280620d73763fc189d25ac /src/testlib | |
| parent | cc2938b5b6aa07210b04bd48ad8a2830701a06e5 (diff) | |
| parent | 4fc070a4192d5b914b6f814a8dcab3f552d9abac (diff) | |
| download | qtbase-d456f87ece0323982b7601047712545ab95426ad.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qfilesystemwatcher_win.cpp
src/corelib/plugin/plugin.pri
src/plugins/platforms/cocoa/qcocoaaccessibility.mm
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 1 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 8b4b2ab731..4ef2dd3f67 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -40,7 +40,6 @@ #include "qtestresult_p.h" #include <QtTest/qtestcase.h> -#include <QtTest/qtest.h> #include <QtCore/qbytearray.h> #include <QtCore/qfile.h> #include <QtCore/qset.h> diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 1a634a0f75..7b567674e4 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -332,7 +332,9 @@ static void qPrintDataTags(FILE *stream) member.resize(qstrlen(slot) + qstrlen("_data()") + 1); qsnprintf(member.data(), member.size(), "%s_data()", slot); invokeMethod(QTest::currentTestObject, member.constData()); - for (int j = 0; j < table.dataCount(); ++j) + const int dataCount = table.dataCount(); + localTags.reserve(dataCount); + for (int j = 0; j < dataCount; ++j) localTags << QLatin1String(table.testData(j)->dataTag()); // Print all tag combinations: |