Removing qwtplot3d dependency and fixing a missed include in waterfallGlobalData.h.

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 84514d7ce9ad9f18091cc8f66201a336489737f1..4027bb332bd4f02cf9d40e7e7966f0ab3d6b85d3 100644 (file)
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -42,10 +42,9 @@ AC_DEFUN([GRC_GR_QTGUI],[
 #      QtGui
 #      QtCore
 #      qwt 
-#      qwtplot3d
 #      qt4
 
-# qt4-core, qt4-gui, qwt5-qt4, qwt5-qt4-dev, libqwtplot3d-qt4, libqwtplot3d-qt4-dev, qt4-dev-tools
+# qt4-core, qt4-gui, qwt5-qt4, qwt5-qt4-dev, qt4-dev-tools
 
     if test $passed = yes; then
         dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
@@ -59,20 +58,15 @@ AC_DEFUN([GRC_GR_QTGUI],[
         dnl Fetch QWT variables
         GR_QWT([], [passed=no])
 
-        dnl Process QWT Plot3D only if QWT passed
-       if test "$passed" = "yes"; then
-            GR_QWTPLOT3D([], [passed=no])
-        fi
-
        dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes links
        dnl to QtCore and QtGui libraries)
-       QT_INCLUDES="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
-       QT_LIBS="$QWT_LIBS $QWTPLOT3D_LIBS $QTOPENGL_LIBS"
+       QT_INCLUDES="$QWT_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
+       QT_LIBS="$QWT_LIBS $QTOPENGL_LIBS"
 
         dnl Build an includes variable specifically for running qmake by extracting
-        dnl all includes from the QWT and QWTPLOT3D, without the -I;
+        dnl all includes from the QWT, without the -I;
         dnl qmake appends the -I when processing the project file INCLUDEPATH
-        for i in $QWT_CFLAGS $QWTPLOT3D_CFLAGS; do
+        for i in $QWT_CFLAGS; do
             QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}"
         done
 

diff --git a/gr-qtgui/src/lib/waterfallGlobalData.h b/gr-qtgui/src/lib/waterfallGlobalData.h
index 568b88fabb24b9e9bbc675d40e0619472660d691..51f65064c88f8e4d08af083542516421222037e7 100644 (file)
--- a/gr-qtgui/src/lib/waterfallGlobalData.h
+++ b/gr-qtgui/src/lib/waterfallGlobalData.h
@@ -2,7 +2,6 @@
 #define WATERFALL_GLOBAL_DATA_HPP
 
 #include <qwt_raster_data.h>
-#include <qwt3d_function.h>
 #include <inttypes.h>