Mercurial > octave-nkf
diff libgui/src/main-window.cc @ 20288:0d94ec291ee6
maint: Periodic merge of stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 09 Jun 2015 16:37:53 -0700 |
parents | e914b5399c67 ede7224d062f |
children | 3b25741a9927 |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Sat Jun 06 08:26:21 2015 -0700 +++ b/libgui/src/main-window.cc Tue Jun 09 16:37:53 2015 -0700 @@ -1502,6 +1502,10 @@ connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()), this, SLOT (confirm_shutdown_octave ())); + connect (_octave_qt_link, + SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)), + this, SLOT (copy_image_to_clipboard (const QString&, bool))); + if (_start_gui) { connect (_octave_qt_link, @@ -1551,10 +1555,6 @@ SIGNAL (show_preferences_signal (void)), this, SLOT (process_settings_dialog_request ())); - connect (_octave_qt_link, - SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)), - this, SLOT (copy_image_to_clipboard (const QString&, bool))); - #ifdef HAVE_QSCINTILLA connect (_octave_qt_link, SIGNAL (edit_file_signal (const QString&)),