diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2021-05-27 10:28:48 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-28 08:46:21 +0000 |
| commit | 512971b57f8cdfd06b79659f8c65b62dd4dfe42e (patch) | |
| tree | 6f8152fe46f7adf7c584720cb8d835b73c5bc874 /tests | |
| parent | b32ae49fbfdb1b0a07ec4f0247a50e85ebea608c (diff) | |
| download | qtqa-512971b57f8cdfd06b79659f8c65b62dd4dfe42e.tar.gz | |
On Qt 6, run bic test against Qt 6, not against Qt 5
Change-Id: Ia091c80303ddf042430cc841ab1662b47610ace6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d6184e0c744d33e47bab72258c534d4c08f5848d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/postbuild/bic/tst_bic.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/postbuild/bic/tst_bic.cpp b/tests/postbuild/bic/tst_bic.cpp index c768e44..1f15098 100644 --- a/tests/postbuild/bic/tst_bic.cpp +++ b/tests/postbuild/bic/tst_bic.cpp @@ -467,7 +467,11 @@ void tst_Bic::sizesAndVTables_data() QString key = keys.at(i); for (int i = 0; i <= minor; ++i) { if (i != minor || patch) { +#if QT_VERSION >= 0x060000 + QTest::newRow(key.toLatin1() + ":6." + QByteArray::number(i)) +#else QTest::newRow(key.toLatin1() + ":5." + QByteArray::number(i)) +#endif << key << (QString(qtModuleDir + "/tests/auto/bic/data/%1.") + QString::number(major) |