Browse Source

Merge pull request #2441 from Diapolo/Qt_fix_copy_context_menu

Bitcoin-Qt: fix copy via context-menu broken
0.8
Wladimir J. van der Laan 12 years ago
parent
commit
bcce45e9b0
  1. 9
      src/qt/guiutil.cpp

9
src/qt/guiutil.cpp

@ -160,8 +160,10 @@ void copyEntryData(QAbstractItemView *view, int column, int role) @@ -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, @@ -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() @@ -457,4 +459,3 @@ void HelpMessageBox::showOrPrint()
}
} // namespace GUIUtil

Loading…
Cancel
Save