diff options
| author |   Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer |   Liang Qi <liang.qi@qt.io> | 2020-01-28 14:17:01 +0000 |
| commit | ef442327b8a4122fe46462e95a0537ec5ac53cb6 (patch) | |
| tree | c0a0267ab4175d520a27c1dc7b589af220e77c48 /src/testlib/qtest.h | |
| parent | QProcess: remove deprecated signature of finished signal (diff) | |
| parent | Merge remote-tracking branch 'origin/5.15' into dev (diff) | |
| download | qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.tar.xz qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.zip | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/testlib/qtest.h')
| -rw-r--r-- | src/testlib/qtest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 3b1ffb389e..0298ff96e3 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -218,7 +218,7 @@ template<> inline char *toString(const QVariant &v) vstring.append(type); if (!v.isNull()) { vstring.append(','); - if (v.canConvert(QVariant::String)) { + if (v.canConvert(QMetaType::QString)) { vstring.append(v.toString().toLocal8Bit()); } else { |