summaryrefslogtreecommitdiff
path: root/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc
blob: 58d5c6bf8717d62caeb901ec2618ad06588cbc10 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
$NetBSD: patch-libgui_qterminal_libqterminal_QTerminal.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $

Changes for compiling with Qt5 instead of Qt4

--- libgui/qterminal/libqterminal/QTerminal.cc.orig	2015-05-23 14:21:53.000000000 +0000
+++ libgui/qterminal/libqterminal/QTerminal.cc
@@ -144,10 +144,10 @@ QTerminal::notice_settings (const QSetti
     copy = QKeySequence::Copy; // settings->value () does not work!
 
   //  dis- or enable extra interrupt action
-  QKeySequence ctrl;
+  Qt::KeyboardModifiers ctrl;
   ctrl = Qt::ControlModifier;
 
-  bool extra_ir_action = (copy != QKeySequence (ctrl + Qt::Key_C));
+  bool extra_ir_action = (copy != QKeySequence (ctrl | Qt::Key_C));
 
   _interrupt_action->setEnabled (extra_ir_action);
   has_extra_interrupt (extra_ir_action);