diff options
-rw-r--r-- | cmake/Packaging/Fedora-15.cmake | 2 | ||||
-rw-r--r-- | cmake/Packaging/Fedora-16.cmake | 2 | ||||
-rw-r--r-- | cmake/Packaging/Fedora-17.cmake | 2 | ||||
-rw-r--r-- | cmake/Packaging/Fedora-18.cmake | 2 | ||||
-rw-r--r-- | docs/doxygen/other/build_guide.dox | 1 | ||||
-rw-r--r-- | gr-qtgui/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gr-qtgui/doc/qtgui.dox | 1 |
7 files changed, 4 insertions, 7 deletions
diff --git a/cmake/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake index 18836d871b..c86dbedbd8 100644 --- a/cmake/Packaging/Fedora-15.cmake +++ b/cmake/Packaging/Fedora-15.cmake @@ -1,6 +1,6 @@ SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") diff --git a/cmake/Packaging/Fedora-16.cmake b/cmake/Packaging/Fedora-16.cmake index 18836d871b..c86dbedbd8 100644 --- a/cmake/Packaging/Fedora-16.cmake +++ b/cmake/Packaging/Fedora-16.cmake @@ -1,6 +1,6 @@ SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") diff --git a/cmake/Packaging/Fedora-17.cmake b/cmake/Packaging/Fedora-17.cmake index 23e3334ab9..ee5460702c 100644 --- a/cmake/Packaging/Fedora-17.cmake +++ b/cmake/Packaging/Fedora-17.cmake @@ -1,6 +1,6 @@ SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy" "PyOpenGL") SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") diff --git a/cmake/Packaging/Fedora-18.cmake b/cmake/Packaging/Fedora-18.cmake index 23e3334ab9..ee5460702c 100644 --- a/cmake/Packaging/Fedora-18.cmake +++ b/cmake/Packaging/Fedora-18.cmake @@ -1,6 +1,6 @@ SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs") SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") -SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") +SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4") SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy" "PyOpenGL") SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox index ee07e6355c..c21b9874ac 100644 --- a/docs/doxygen/other/build_guide.dox +++ b/docs/doxygen/other/build_guide.dox @@ -50,7 +50,6 @@ first. Most recent systems have these packages available. \li qt4 (>= 4.4.0) http://qt.nokia.com/downloads/ \li qwt (>= 5.2.0) http://sourceforge.net/projects/qwt/ \li pyqt (>= 4.10.0) http://www.riverbankcomputing.co.uk/software/pyqt/download -\li pyqwt* (>= 5.2.0) http://pyqwt.sourceforge.net/download.html \subsection dep_gr_wxgui gr-wxgui: The WX-based Graphical User Interface \li wxpython (>= 2.8) http://www.wxpython.org/ diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 13cbfb2e1f..ad832b94a1 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -38,7 +38,6 @@ include(GrComponent) if(NOT CMAKE_CROSSCOMPILING) set(qt_gui_python_deps PYQT4_FOUND - #we could check for pyqwt, but its not strictly required ) endif(NOT CMAKE_CROSSCOMPILING) diff --git a/gr-qtgui/doc/qtgui.dox b/gr-qtgui/doc/qtgui.dox index 1d4c3099a3..3cce328f9a 100644 --- a/gr-qtgui/doc/qtgui.dox +++ b/gr-qtgui/doc/qtgui.dox @@ -132,7 +132,6 @@ The QT GUI blocks require the following dependencies. \li QtOpenGL (version >= 4.4) \li PyQt4 for Qt4 (version >= 4.4) \li Qwt (version >= 5.2) -\li PyQwt5 for Qt4 (version >= 5.2) \section qtgui_usage Usage |