[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: qtgui: remove dependency mentions of
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: qtgui: remove dependency mentions of PyQWT. |
Date: |
Thu, 2 Apr 2015 22:18:19 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 04faaba502eaa78e87463ca66c1a681bc17c5869
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 2 13:32:54 2015 -0700
qtgui: remove dependency mentions of PyQWT.
Using PyQT widgets now instead of PyQWT for the QT Range widget. Some
programs, like gr_filter_design, require PyQWT but will explicitly
fail and tell the user that the package is missing. PyQWT is no longer
required for gr-qtgui.
---
cmake/Packaging/Fedora-15.cmake | 2 +-
cmake/Packaging/Fedora-16.cmake | 2 +-
cmake/Packaging/Fedora-17.cmake | 2 +-
cmake/Packaging/Fedora-18.cmake | 2 +-
docs/doxygen/other/build_guide.dox | 1 -
gr-qtgui/CMakeLists.txt | 1 -
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 18836d8..c86dbed 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 18836d8..c86dbed 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 23e3334..ee54607 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 23e3334..ee54607 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 ee07e63..c21b987 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 13cbfb2..ad832b9 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 1d4c309..3cce328 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
- [Commit-gnuradio] [gnuradio] branch master updated (3061e47 -> 04faaba), git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 05/05: qtgui: remove dependency mentions of PyQWT.,
git <=
- [Commit-gnuradio] [gnuradio] 03/05: qt-gui: updating range, counter now shows decimals, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 01/05: qtgui: Initial removal of pyqwt. Replaced with pyqt4., git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 02/05: qtgui: Replaced pyqwt range block with working pyqt version., git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 04/05: qtgui: counter_slider now respond to each other without error, git, 2015/04/02