merging qtdevel branch -r10534:10564 to sync with trunk because my computer got confu...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10565 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 54bdb2d3b755bc4877e489f7e5538ef20f9c4abe..a62612904dc006a6342499e0fac18c944eb3b604 100644 (file)
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -41,12 +41,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
 
     if test $passed = yes; then
         dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
-        PKG_CHECK_MODULES(QTCORE, QtCore >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore.])])
-        PKG_CHECK_MODULES(QTGUI, QtGui >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui.])])
-        PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL.])])
+        PKG_CHECK_MODULES(QTCORE, QtCore >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.2.])])
+        PKG_CHECK_MODULES(QTGUI, QtGui >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4.2.])])
+        PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.2.])])
        
         dnl Fetch QWT variables
         GR_QWT([], [passed=no])