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:14:20 +0000 |
| commit | 558fc903acc610769279da2737ad679aa9fd728d (patch) | |
| tree | ebe36deb140e47ca32fea9b0753cde06f465a0fa /src/dbus/qdbusutil.cpp | |
| parent | 089d54f06ff327f5212cb08fdbcb540066357dd5 (diff) | |
| parent | be8c257da9a264994243c120231965ff0008ef09 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/io/qsettings.cpp
src/corelib/kernel/qvariant.cpp
src/corelib/serialization/qjsoncbor.cpp
src/corelib/serialization/qjsonvalue.cpp
src/corelib/tools/tools.pri
src/gui/image/qimage.cpp
src/gui/kernel/qguivariant.cpp
src/widgets/kernel/qshortcut.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
tests/auto/tools/moc/tst_moc.cpp
src/opengl/qglframebufferobject.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271
Diffstat (limited to 'src/dbus/qdbusutil.cpp')
| -rw-r--r-- | src/dbus/qdbusutil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 09311d1ad4..b4ee6811ac 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -82,7 +82,7 @@ static bool variantToString(const QVariant &arg, QString &out) { int argType = arg.userType(); - if (argType == QVariant::StringList) { + if (argType == QMetaType::QStringList) { out += QLatin1Char('{'); const QStringList list = arg.toStringList(); for (const QString &item : list) @@ -90,7 +90,7 @@ static bool variantToString(const QVariant &arg, QString &out) if (!list.isEmpty()) out.chop(2); out += QLatin1Char('}'); - } else if (argType == QVariant::ByteArray) { + } else if (argType == QMetaType::QByteArray) { out += QLatin1Char('{'); QByteArray list = arg.toByteArray(); for (int i = 0; i < list.count(); ++i) { @@ -100,7 +100,7 @@ static bool variantToString(const QVariant &arg, QString &out) if (!list.isEmpty()) out.chop(2); out += QLatin1Char('}'); - } else if (argType == QVariant::List) { + } else if (argType == QMetaType::QVariantList) { out += QLatin1Char('{'); const QList<QVariant> list = arg.toList(); for (const QVariant &item : list) { @@ -148,7 +148,7 @@ static bool variantToString(const QVariant &arg, QString &out) if (!variantToString(v, out)) return false; out += QLatin1Char(']'); - } else if (arg.canConvert(QVariant::String)) { + } else if (arg.canConvert(QMetaType::QString)) { out += QLatin1Char('\"') + arg.toString() + QLatin1Char('\"'); } else { out += QLatin1Char('['); |