X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fdecoder_binary%2Fview.cpp;h=b5daaf0f84ef472dd7586cb9ab423a13cec6f156;hp=05d5ed4612c9ba7b5897ca67076b04f9f42d4ca8;hb=HEAD;hpb=978dbc9a3e3c4bf8b42f00a269d04d0dca62b1a5

diff --git a/pv/views/decoder_binary/view.cpp b/pv/views/decoder_binary/view.cpp
index 05d5ed46..6e61fa3a 100644
--- a/pv/views/decoder_binary/view.cpp
+++ b/pv/views/decoder_binary/view.cpp
@@ -110,7 +110,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()));
 
@@ -327,10 +331,18 @@ void View::save_data_as_hex_dump(bool with_offset, bool with_ascii) const
 		while (offset < selection.second) {
 			size_t end = std::min((uint64_t)(selection.second), offset + n);
 			offset = hex_view_->create_hex_line(offset, end, &s, with_offset, with_ascii);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+			out_stream << s << Qt::endl;
+#else
 			out_stream << s << endl;
+#endif
 		}
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+		out_stream << Qt::endl;
+#else
 		out_stream << endl;
+#endif
 
 		if (out_stream.status() != QTextStream::Ok) {
 			QMessageBox msg(parent_);