mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Bitcoin-Qt: fix copy via context-menu broken
- as QClipboard::Selection isn't available on Windows ensure that the correct mode is called, but sill allow selection for e.g. X11 - start conversion from QCoreApplication::instance() to qApp in guiutil.cpp (I intend to harmonize this all over the source with my Qt5 compatibility pull)
This commit is contained in:
parent
cf4d976f0e
commit
39ee86257c
@ -160,8 +160,10 @@ void copyEntryData(QAbstractItemView *view, int column, int role)
|
|||||||
|
|
||||||
if(!selection.isEmpty())
|
if(!selection.isEmpty())
|
||||||
{
|
{
|
||||||
// Copy first item
|
// Copy first item (global clipboard)
|
||||||
QApplication::clipboard()->setText(selection.at(0).data(role).toString(),QClipboard::Selection);
|
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()
|
Qt::ConnectionType blockingGUIThreadConnection()
|
||||||
{
|
{
|
||||||
if(QThread::currentThread() != QCoreApplication::instance()->thread())
|
if(QThread::currentThread() != qApp->thread())
|
||||||
{
|
{
|
||||||
return Qt::BlockingQueuedConnection;
|
return Qt::BlockingQueuedConnection;
|
||||||
}
|
}
|
||||||
@ -457,4 +459,3 @@ void HelpMessageBox::showOrPrint()
|
|||||||
}
|
}
|
||||||
|
|
||||||
} // namespace GUIUtil
|
} // namespace GUIUtil
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user