diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-08 08:27:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-07-08 08:27:32 -0700 |
| commit | 581ca6f61bec0cca07cbe5a6c7db706a9704efa1 (patch) | |
| tree | 8f43413742f5d334945386dea8d326c28cff412b | |
| parent | cd99526b5d1c8b1130ac1ba87e21f96c621b1bdc (diff) | |
| parent | b10df0bc36f80497308a664b1a0bfed8a85577e2 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h | 3 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/displayform.h | 3 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h index 8e04218ed0..605fb4196e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h @@ -23,6 +23,7 @@ #ifndef CONSTELLATION_DISPLAY_FORM_H #define CONSTELLATION_DISPLAY_FORM_H +#include <gnuradio/qtgui/api.h> #include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QtGui/QtGui> @@ -34,7 +35,7 @@ * \brief DisplayForm child for managing constellaton (I&Q) plots. * \ingroup qtgui_blk */ -class ConstellationDisplayForm : public DisplayForm +class QTGUI_API ConstellationDisplayForm : public DisplayForm { Q_OBJECT diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index df0d5a94d6..f94bb7fd04 100644 --- a/gr-qtgui/include/gnuradio/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -24,6 +24,7 @@ #define DISPLAY_FORM_H #include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/api.h> #include <QtGui/QtGui> #include <vector> @@ -37,7 +38,7 @@ * \brief Base class for setting up and managing QTGUI plot forms. * \ingroup qtgui_blk */ -class DisplayForm : public QWidget +class QTGUI_API DisplayForm : public QWidget { Q_OBJECT diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h index 361610d095..f3bb486d82 100644 --- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h @@ -29,6 +29,7 @@ #include <complex> #include <vector> #include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/api.h> static const int SpectrumUpdateEventType = 10005; static const int SpectrumWindowCaptionEventType = 10008; @@ -173,7 +174,7 @@ private: /********************************************************************/ -class ConstUpdateEvent: public QEvent +class QTGUI_API ConstUpdateEvent: public QEvent { public: ConstUpdateEvent(const std::vector<double*> realDataPoints, |