view src/stable-octave-3-termfocus.patch @ 3638:af91c561ff39

openscenegraph: allow cross compile to succeed * src/openscenegraph.mk: add -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED_EXITCODE=0, build out of source, enable static/dynamic libs * src/openscenegraph-1-fixes.patch: new file * dist-files.mk: added openscenegraph-1-fixes.patch
author John Donoghue
date Wed, 02 Jul 2014 15:27:12 -0400
parents 37d705830a35
children
line wrap: on
line source

diff -r 3283ce934648 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 11:40:40 2014 -0700
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 20:38:10 2014 -0400
@@ -267,9 +267,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd)
-  : q (parent), m_command (cmd), m_hasBlinkingCursor (true),
-    m_cursorType (BlockCursor), m_beginSelection (0, 0),
-    m_endSelection (0, 0), m_settingSelection (false),
+  : q (parent), m_command (cmd), m_cursorBlinking (false),
+    m_hasBlinkingCursor (true), m_cursorType (BlockCursor), 
+    m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false),
     m_process (NULL), m_inWheelEvent (false)
 {
   log (NULL);