feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Check for selection support of clipboard

Browse Source 
Setting the data on a non-supported MIME data will fail
and get deleted.
Checking beforehand gets rid of a warning printed by
QClipboard.

Change-Id: I5b5a371ce5b904f61a1aed5ea21a98908155357b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-05-12 14:56:01 +02:00
parent c3946529ca
commit 5104798b8c
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -586,7 +586,8 @@ DebuggerToolTipWidget::DebuggerToolTipWidget()
<< item->name << '\t' << item->value << '\t' << item->type << '\n'; << item->name << '\t' << item->value << '\t' << item->type << '\n';
}); });
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(text, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(text, QClipboard::Selection);
clipboard->setText(text, QClipboard::Clipboard); clipboard->setText(text, QClipboard::Clipboard);
}); });

3
src/plugins/debugger/stackhandler.cpp
View File

@@ -479,7 +479,8 @@ void StackHandler::copyContentsToClipboard()
}); });
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(str, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(str, QClipboard::Selection);
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);
} }

3
src/plugins/debugger/watchhandler.cpp
View File

@@ -1596,7 +1596,8 @@ static QString removeWatchActionText(QString exp)
static void copyToClipboard(const QString &clipboardText) static void copyToClipboard(const QString &clipboardText)
{ {
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(clipboardText, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(clipboardText, QClipboard::Selection);
clipboard->setText(clipboardText, QClipboard::Clipboard); clipboard->setText(clipboardText, QClipboard::Clipboard);
} }

3
src/plugins/perfprofiler/perfprofilerstatisticsview.cpp
View File

@@ -204,7 +204,8 @@ QString StatisticsView::rowToString(int row) const
static void sendToClipboard(const QString &str) static void sendToClipboard(const QString &str)
{ {
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(str, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(str, QClipboard::Selection);
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);
} }

6
src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp
View File

@@ -360,7 +360,8 @@ void QmlProfilerStatisticsMainView::copyTableToClipboard() const
str += textForItem(itemModel->index(i, 0)); str += textForItem(itemModel->index(i, 0));
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(str, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(str, QClipboard::Selection);
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);
} }
@@ -368,7 +369,8 @@ void QmlProfilerStatisticsMainView::copyRowToClipboard() const
{ {
QString str = textForItem(selectedModelIndex()); QString str = textForItem(selectedModelIndex());
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(str, QClipboard::Selection); if (clipboard->supportsSelection())
clipboard->setText(str, QClipboard::Selection);
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);
} }