From 9ae8997e5f682bc16e58c0a0bba21794dbd705c5 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 6 Dec 2010 22:46:39 -0500
Subject: qtgui: created a forms module with a slider and text box, implemented
 in grc

---
 config/grc_gr_qtgui.m4 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config/grc_gr_qtgui.m4')

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 4027bb332..6a69dd7a8 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -82,6 +82,8 @@ AC_DEFUN([GRC_GR_QTGUI],[
 
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
+        gr-qtgui/grc/Makefile \
+        gr-qtgui/python/Makefile \
         gr-qtgui/src/Makefile \
         gr-qtgui/src/lib/Makefile \
         gr-qtgui/src/python/Makefile \
-- 
cgit 


From a284640decd1fd6634f35bd1e20fd69b9194a7b6 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 18 Jan 2011 22:42:48 -0800
Subject: qtgui: use pyqwt widgets in grc variable slider block

---
 config/grc_gr_qtgui.m4 | 2 --
 1 file changed, 2 deletions(-)

(limited to 'config/grc_gr_qtgui.m4')

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 6a69dd7a8..4027bb332 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -82,8 +82,6 @@ AC_DEFUN([GRC_GR_QTGUI],[
 
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
-        gr-qtgui/grc/Makefile \
-        gr-qtgui/python/Makefile \
         gr-qtgui/src/Makefile \
         gr-qtgui/src/lib/Makefile \
         gr-qtgui/src/python/Makefile \
-- 
cgit 


From e30f0a7ca02801732ad7a25ab83e1d27dc45c6ce Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Jan 2011 22:31:31 -0800
Subject: grc: added tabbed widget in qtgui for grc

created gui_hint type to handle tab descriptor + position markup,
and to handle the generation of the name of the parent widget.
No support python modules required in gr-qtgui.
---
 config/grc_gr_qtgui.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/grc_gr_qtgui.m4')

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 4027bb332..c14f984c3 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2011 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -82,6 +82,7 @@ AC_DEFUN([GRC_GR_QTGUI],[
 
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
+        gr-qtgui/grc/Makefile \
         gr-qtgui/src/Makefile \
         gr-qtgui/src/lib/Makefile \
         gr-qtgui/src/python/Makefile \
-- 
cgit 


From d658659c4cb72385f921a03c37bb58b452190aab Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 7 Mar 2011 12:45:06 -0800
Subject: qtgui-grc: added check for pyqwt in config

---
 config/grc_gr_qtgui.m4 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'config/grc_gr_qtgui.m4')

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index c14f984c3..92392c883 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -29,13 +29,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
     dnl   no   : otherwise
 
     PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \
-	[passed=yes], [passed=no], \
-	[PyQt4.QtCore.PYQT_VERSION >= 260000])
+        [], [passed=no], \
+        [PyQt4.QtCore.PYQT_VERSION >= 260000])
 
-    # Enable this if we want to test for PyQwt, too
-    #PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \
-    #   [passed=yes], [passed=no], \
-    #   [PyQt4.Qwt5.QWT_VERSION >= 327000])
+    PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \
+       [], [passed=no], \
+       [PyQt4.Qwt5.QWT_VERSION >= 327000])
 
 # Check for: 
 #	QtOpenGL
-- 
cgit