X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fwidgets%2Fsweeptimingwidget.cpp;h=0f1eb6d9ff2595f0f484c357655b9691ebbcbf92;hb=HEAD;hp=12f5969eb707c9997c212e1d39f838541c1f5588;hpb=bc4b9ccfc78d9d0987525360fa6d93bed681951a;p=pulseview.git

diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index 12f5969e..0f1eb6d9 100644
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -54,7 +54,11 @@ SweepTimingWidget::SweepTimingWidget(const char *suffix,
 		this, SIGNAL(value_changed()));
 
 	setLayout(&layout_);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	layout_.setContentsMargins(0, 0, 0, 0);
+#else
 	layout_.setMargin(0);
+#endif
 	layout_.addWidget(&list_);
 	layout_.addWidget(&value_);
 
@@ -95,7 +99,7 @@ void SweepTimingWidget::show_list(const uint64_t *vals, size_t count)
 	list_.clear();
 	for (size_t i = 0; i < count; i++) {
 		char *const s = sr_si_string_u64(vals[i], suffix_);
-		list_.addItem(QString::fromUtf8(s), qVariantFromValue(vals[i]));
+		list_.addItem(QString::fromUtf8(s), QVariant::fromValue(vals[i]));
 		g_free(s);
 	}