Merge pull request #2441 from Diapolo/Qt_fix_copy_context_menu

laanwj · laanwj · commit bcce45e9b012 · 2013-04-02T07:34:35.000-07:00
Bitcoin-Qt: fix copy via context-menu broken
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -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
-

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,10 @@ void copyEntryData(QAbstractItemView *view, int column, int role)`
`160`	`160`
`161`	`161`	`if(!selection.isEmpty())`
`162`	`162`	`{`
`163`		`- // Copy first item`
`164`		`- QApplication::clipboard()->setText(selection.at(0).data(role).toString(),QClipboard::Selection);`
	`163`	`+ // Copy first item (global clipboard)`
	`164`	`+ qApp->clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Clipboard);`
	`165`	`+ // Copy first item (global mouse selection for e.g. X11 - NOP on Windows)`
	`166`	`+ qApp->clipboard()->setText(selection.at(0).data(role).toString(), QClipboard::Selection);`
`165`	`167`	`}`
`166`	`168`	`}`
`167`	`169`
`@@ -213,7 +215,7 @@ QString getSaveFileName(QWidget *parent, const QString &caption,`
`213`	`215`
`214`	`216`	`Qt::ConnectionType blockingGUIThreadConnection()`
`215`	`217`	`{`
`216`		`- if(QThread::currentThread() != QCoreApplication::instance()->thread())`
	`218`	`+ if(QThread::currentThread() != qApp->thread())`
`217`	`219`	`{`
`218`	`220`	`return Qt::BlockingQueuedConnection;`
`219`	`221`	`}`
`@@ -457,4 +459,3 @@ void HelpMessageBox::showOrPrint()`
`457`	`459`	`}`
`458`	`460`
`459`	`461`	`} // namespace GUIUtil`
`460`		`-`