Merge pull request #2441 from Diapolo/Qt_fix_copy_context_menu
Bitcoin-Qt: fix copy via context-menu broken
This commit is contained in:
commit
bcce45e9b0
1 changed files with 5 additions and 4 deletions
|
@ -160,8 +160,10 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
|
|||
|
||||
if(!selection.isEmpty())
|
||||
{
|
||||
// Copy first item
|
||||
QApplication::clipboard()->setText(selection.at(0).data(role).toString(),QClipboard::Selection);
|
||||
// Copy first item (global clipboard)
|
||||
qApp->clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard);
|
||||
// Copy first item (global mouse selection for e.g. X11 - NOP on Windows)
|
||||
qApp->clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -213,7 +215,7 @@ QString getSaveFileName(QWidget *parent, const QString &caption,
|
|||
|
||||
Qt::ConnectionType blockingGUIThreadConnection()
|
||||
{
|
||||
if(QThread::currentThread() != QCoreApplication::instance()->thread())
|
||||
if(QThread::currentThread() != qApp->thread())
|
||||
{
|
||||
return Qt::BlockingQueuedConnection;
|
||||
}
|
||||
|
@ -457,4 +459,3 @@ void HelpMessageBox::showOrPrint()
|
|||
}
|
||||
|
||||
} // namespace GUIUtil
|
||||
|
||||
|
|
Loading…
Reference in a new issue