From c3dcc1ee38e496a6720a7c43a776ef9ed35a20be Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 20 Jun 2022 11:42:24 +0200
Subject: Debugger: Use new clipboard setting convenience

Change-Id: I4bbbff708287a0999c8009b6c2bd91967ee63808
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/debugger/stackhandler.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/plugins/debugger/stackhandler.cpp')

diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index c42c196b09..4001b85448 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -40,9 +40,8 @@
 #include <utils/basetreeview.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
-#include <QApplication>
-#include <QClipboard>
 #include <QContextMenuEvent>
 #include <QDebug>
 #include <QDir>
@@ -410,14 +409,6 @@ static QString selectedText(QWidget *widget, bool useAll)
     return str;
 }
 
-static void copyTextToClipboard(const QString &str)
-{
-    QClipboard *clipboard = QApplication::clipboard();
-    if (clipboard->supportsSelection())
-        clipboard->setText(str, QClipboard::Selection);
-    clipboard->setText(str, QClipboard::Clipboard);
-}
-
 // Write stack frames as task file for displaying it in the build issues pane.
 void StackHandler::saveTaskFile()
 {
@@ -458,11 +449,11 @@ bool StackHandler::contextMenuEvent(const ItemViewEvent &ev)
     menu->addAction(debuggerSettings()->expandStack.action());
 
     addAction(this, menu, tr("Copy Contents to Clipboard"), true, [ev] {
-        copyTextToClipboard(selectedText(ev.view(), true));
+        setClipboardAndSelection(selectedText(ev.view(), true));
     });
 
     addAction(this, menu, tr("Copy Selection to Clipboard"), true, [ev] {
-        copyTextToClipboard(selectedText(ev.view(), false));
+        setClipboardAndSelection(selectedText(ev.view(), false));
     });
 
     addAction(this, menu, tr("Save as Task File..."), true, [this] { saveTaskFile(); });
-- 
cgit v1.2.1