diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-16 22:14:29 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-16 22:14:29 -0400 |
| commit | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (patch) | |
| tree | 60b19871647430da19e7303b1394af50742d48dc /gr-qtgui/include | |
| parent | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff) | |
| parent | 2d5a6f86fd3047748a9f816548e2901b02838734 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/lib/Makefile.am
Diffstat (limited to 'gr-qtgui/include')
| -rw-r--r-- | gr-qtgui/include/qtgui_sink_f.h | 1 | ||||
| -rw-r--r-- | gr-qtgui/include/qtgui_util.h | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gr-qtgui/include/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h index bc14147c25..2d79b5eef0 100644 --- a/gr-qtgui/include/qtgui_sink_f.h +++ b/gr-qtgui/include/qtgui_sink_f.h @@ -29,7 +29,6 @@ #include <gr_firdes.h> #include <gri_fft.h> #include <qapplication.h> -//#include <qtgui.h> #include "SpectrumGUIClass.h" class qtgui_sink_f; diff --git a/gr-qtgui/include/qtgui_util.h b/gr-qtgui/include/qtgui_util.h index 5b129c7b56..7b3692e75a 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 */ |