From dcb73f9ed213dcf60e8bdc34c03636c465530063 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Mon, 20 Mar 2023 09:34:44 +0800 Subject: [PATCH] Builds with Qt6.4 --- DSView/pv/mainwindow.cpp | 1 + DSView/pv/storesession.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp index 3da4f40e..ebb4cc24 100644 --- a/DSView/pv/mainwindow.cpp +++ b/DSView/pv/mainwindow.cpp @@ -689,6 +689,7 @@ namespace pv s_obj["type"] = s->get_type(); s_obj["enabled"] = s->enabled(); s_obj["name"] = s->get_name(); + if (s->get_colour().isValid()) s_obj["colour"] = QJsonValue::fromVariant(s->get_colour()); else diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp index 03fe9bf8..7095d87d 100644 --- a/DSView/pv/storesession.cpp +++ b/DSView/pv/storesession.cpp @@ -1070,7 +1070,8 @@ bool StoreSession::json_decoders(QJsonArray &array) } else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE("s"))) { GVariant *const var = dec_binding->getter(opt->id); if (var != NULL) { - options_obj[opt->id] = QJsonValue::fromVariant(g_variant_get_string(var, NULL)); + const char *sz = g_variant_get_string(var, NULL); + options_obj[opt->id] = QJsonValue::fromVariant(QString(sz)); g_variant_unref(var); } }else { @@ -1079,12 +1080,12 @@ bool StoreSession::json_decoders(QJsonArray &array) } if (have_probes) { - dec_obj["id"] = QJsonValue::fromVariant(d->id); + dec_obj["id"] = QJsonValue::fromVariant(QString(d->id)); dec_obj["channel"] = ch_array; dec_obj["options"] = options_obj; } else { QJsonObject stack_obj; - stack_obj["id"] = QJsonValue::fromVariant(d->id); + stack_obj["id"] = QJsonValue::fromVariant(QString(d->id)); stack_obj["options"] = options_obj; stack_array.push_back(stack_obj); }