X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fview.cpp;h=7e4b3ddb414dd28887842aad9e2f4cf421e5086e;hb=HEAD;hp=0aca4790e8ecc6d984df00129811a1a82fae7077;hpb=b36ba61198551c5994c9b3210b07109ac0d87829;p=pulseview.git

diff --git a/pv/views/tabular_decoder/view.cpp b/pv/views/tabular_decoder/view.cpp
index 0aca4790..c1d74290 100644
--- a/pv/views/tabular_decoder/view.cpp
+++ b/pv/views/tabular_decoder/view.cpp
@@ -202,7 +202,11 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	save_action_->setText(tr("&Save..."));
 	save_action_->setIcon(QIcon::fromTheme("document-save-as",
 		QIcon(":/icons/document-save-as.png")));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	save_action_->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
+#else
 	save_action_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
+#endif
 	connect(save_action_, SIGNAL(triggered(bool)),
 		this, SLOT(on_actionSave_triggered()));
 
@@ -662,7 +666,6 @@ void View::on_metadata_object_changed(MetadataObject* obj,
 	// Check if we need to update the model's data range. We only work on the
 	// end sample value because the start sample value is updated first and
 	// we don't want to update the model twice
-
 	if ((view_mode_selector_->currentIndex() == ViewModeVisible) &&
 		(obj->type() == MetadataObjMainViewRange) &&
 		(value_type == MetadataValueEndSample)) {