diff options
| author | Tom Rondeau | 2011-10-17 13:37:04 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-17 13:37:04 -0400 |
| commit | fef3fe57c75ce6011c87bc894472639d385fcb21 (patch) | |
| tree | 8a11749b2a06a8fa5d42af9911cf556d1c41c608 /gr-qtgui/include/qtgui_util.h | |
| parent | 07324710bdf7eba63417e5591ff37c7641a3f7ab (diff) | |
| parent | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (diff) | |
| download | gnuradio-fef3fe57c75ce6011c87bc894472639d385fcb21.tar.gz gnuradio-fef3fe57c75ce6011c87bc894472639d385fcb21.tar.bz2 gnuradio-fef3fe57c75ce6011c87bc894472639d385fcb21.zip | |
Merge branch 'next' into dig_ofdm
Diffstat (limited to 'gr-qtgui/include/qtgui_util.h')
| -rw-r--r-- | gr-qtgui/include/qtgui_util.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gr-qtgui/include/qtgui_util.h b/gr-qtgui/include/qtgui_util.h index 5b129c7b5..7b3692e75 100644 --- a/gr-qtgui/include/qtgui_util.h +++ b/gr-qtgui/include/qtgui_util.h @@ -44,7 +44,14 @@ public: QwtPickerDblClickPointMachine(); ~QwtPickerDblClickPointMachine(); - virtual CommandList transition( const QwtEventPattern &eventPattern, const QEvent *e); +#if QWT_VERSION < 0x060000 + virtual CommandList transition( const QwtEventPattern &eventPattern, + const QEvent *e); +#else + virtual QList<QwtPickerMachine::Command> + transition( const QwtEventPattern &eventPattern, + const QEvent *e); +#endif }; #endif /* INCLUDED_QTGUI_UTIL_H */ |