Mercurial > octave

changeset 22263:05a8be08368e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use Q_GLOBAL_STATIC with Qt 5.1 or later (bug #48753) * KeyboardTranslator.h: Use Q_GLOBAL_STATIC for Qt 5.1 or later.
author John W. Eaton <jwe@octave.org>
date Thu, 11 Aug 2016 08:16:52 -0400
parents a41c83fc601b
children 9b78fda78300
files libgui/qterminal/libqterminal/unix/KeyboardTranslator.h
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h	Thu Aug 11 08:00:49 2016 +0200
+++ b/libgui/qterminal/libqterminal/unix/KeyboardTranslator.h	Thu Aug 11 08:16:52 2016 -0400
@@ -32,6 +32,10 @@
 #include <QtCore/QVarLengthArray>
 #include <QtCore>
 
+#if QT_VERSION >= 0x050100
+#  define K_GLOBAL_STATIC Q_GLOBAL_STATIC
+#else
+
 typedef void (*CleanUpFunction)();
 
 /**
@@ -102,10 +106,8 @@
         delete x;                                                              \
     }                                                                          \
 } NAME;
-								
-								
 
-
+#endif
 
 class QIODevice;
 class QTextStream;