summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gr-filter/examples/gr_filtdes_callback.py4
-rw-r--r--gr-filter/examples/gr_filtdes_live_upd.py8
-rw-r--r--gr-filter/examples/gr_filtdes_restrict.py4
-rw-r--r--gr-qtgui/apps/uhd_display.py6
-rw-r--r--gr-qtgui/apps/usrp_display_qtgui.py2
-rw-r--r--gr-qtgui/docs/qtgui.dox10
-rw-r--r--gr-qtgui/examples/pyqt_waterfall_c.py2
-rwxr-xr-xgr-qtgui/python/qtgui/range.py.cmakein2
-rwxr-xr-xgr-utils/plot_tools/gr_plot_qt6
-rw-r--r--gr-utils/plot_tools/pyqt_filter.py4
-rw-r--r--gr-utils/plot_tools/pyqt_plot.py4
-rwxr-xr-xgr-zeromq/examples/python/fixui4py.sh2
-rw-r--r--gr-zeromq/examples/python/gui.py4
-rw-r--r--gr-zeromq/examples/python/main_window.ui2
-rw-r--r--grc/tests/resources/file3.block.yml2
15 files changed, 31 insertions, 31 deletions
diff --git a/gr-filter/examples/gr_filtdes_callback.py b/gr-filter/examples/gr_filtdes_callback.py
index d088f929a3..d27943174e 100644
--- a/gr-filter/examples/gr_filtdes_callback.py
+++ b/gr-filter/examples/gr_filtdes_callback.py
@@ -11,9 +11,9 @@
from gnuradio.filter import filter_design
import sys
try:
- from PyQt4 import Qt, QtCore, QtGui
+ from PyQt5 import Qt, QtCore, QtGui
except ImportError:
- print("Please install PyQt4 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
+ print("Please install PyQt5 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
raise SystemExit(1)
'''
diff --git a/gr-filter/examples/gr_filtdes_live_upd.py b/gr-filter/examples/gr_filtdes_live_upd.py
index 2cd3b9038f..d173388137 100644
--- a/gr-filter/examples/gr_filtdes_live_upd.py
+++ b/gr-filter/examples/gr_filtdes_live_upd.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012,2020 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -15,10 +15,10 @@ import sys
try:
from gnuradio import qtgui
- from PyQt4 import QtGui, QtCore
+ from PyQt5 import QtGui, QtCore
import sip
except ImportError:
- sys.stderr.write("Error: Program requires PyQt4 and gr-qtgui.\n")
+ sys.stderr.write("Error: Program requires PyQt5 and gr-qtgui.\n")
sys.exit(1)
@@ -72,7 +72,7 @@ class my_top_block(gr.top_block):
pyQt = self.snk1.pyqwidget()
# Wrap the pointer as a PyQt SIP object
- # This can now be manipulated as a PyQt4.QtGui.QWidget
+ # This can now be manipulated as a PyQt5.QtGui.QWidget
pyWin = sip.wrapinstance(pyQt, QtGui.QWidget)
pyWin.show()
diff --git a/gr-filter/examples/gr_filtdes_restrict.py b/gr-filter/examples/gr_filtdes_restrict.py
index 24c9d8f4b9..e707895717 100644
--- a/gr-filter/examples/gr_filtdes_restrict.py
+++ b/gr-filter/examples/gr_filtdes_restrict.py
@@ -11,9 +11,9 @@
from gnuradio.filter import filter_design
import sys
try:
- from PyQt4 import Qt, QtCore, QtGui
+ from PyQt5 import Qt, QtCore, QtGui
except ImportError:
- print("Please install PyQt4 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
+ print("Please install PyQt5 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
raise SystemExit(1)
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py
index aebb3421c2..71d84d3fe1 100644
--- a/gr-qtgui/apps/uhd_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -19,10 +19,10 @@ import sys
try:
from gnuradio import qtgui
- from PyQt4 import QtGui, QtCore
+ from PyQt5 import QtGui, QtCore
import sip
except ImportError:
- print("Error: Program requires PyQt4 and gr-qtgui.")
+ print("Error: Program requires PyQt5 and gr-qtgui.")
sys.exit(1)
try:
@@ -206,7 +206,7 @@ class my_top_block(gr.top_block):
# Get the reference pointer to the SpectrumDisplayForm QWidget
# Wrap the pointer as a PyQt SIP object
- # This can now be manipulated as a PyQt4.QtGui.QWidget
+ # This can now be manipulated as a PyQt5.QtGui.QWidget
self.pysink = sip.wrapinstance(self.snk.pyqwidget(), QtGui.QWidget)
self.main_win = main_window(self.pysink, self)
diff --git a/gr-qtgui/apps/usrp_display_qtgui.py b/gr-qtgui/apps/usrp_display_qtgui.py
index 4c9de3a53c..d14c7535c8 100644
--- a/gr-qtgui/apps/usrp_display_qtgui.py
+++ b/gr-qtgui/apps/usrp_display_qtgui.py
@@ -7,7 +7,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
diff --git a/gr-qtgui/docs/qtgui.dox b/gr-qtgui/docs/qtgui.dox
index 5790d88a97..4d1b41e742 100644
--- a/gr-qtgui/docs/qtgui.dox
+++ b/gr-qtgui/docs/qtgui.dox
@@ -128,11 +128,11 @@ when asking for the delay outside of the available range.
The QT GUI blocks require the following dependencies.
-\li QtCore (version >= 4.4)
-\li QtGui (version >= 4.4)
-\li QtOpenGL (version >= 4.4)
+\li QtCore (version >= 5.6)
+\li QtGui (version >= 5.6)
+\li QtOpenGL (version >= 5.6)
\li PyQt5 for Qt5 (version >= 5.0)
-\li Qwt (version >= 5.2)
+\li Qwt (version >= 6.1)
\section qtgui_usage Usage
@@ -150,7 +150,7 @@ qapp's "exec_()" function is called. This function is a blocking call
while the GUI is alive.
\code
-from PyQt4 import Qt
+from PyQt5 import Qt
from gnuradio import qtgui
import sys, sip
diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py
index 74abafd23f..f0b3cf4e5e 100644
--- a/gr-qtgui/examples/pyqt_waterfall_c.py
+++ b/gr-qtgui/examples/pyqt_waterfall_c.py
@@ -17,7 +17,7 @@ try:
from PyQt5 import QtWidgets, Qt
import sip
except ImportError:
- sys.stderr.write("Error: Program requires PyQt4 and gr-qtgui.\n")
+ sys.stderr.write("Error: Program requires PyQt5 and gr-qtgui.\n")
sys.exit(1)
try:
diff --git a/gr-qtgui/python/qtgui/range.py.cmakein b/gr-qtgui/python/qtgui/range.py.cmakein
index ae3ab759e9..2a055e4243 100755
--- a/gr-qtgui/python/qtgui/range.py.cmakein
+++ b/gr-qtgui/python/qtgui/range.py.cmakein
@@ -370,7 +370,7 @@ class RangeWidget(QtWidgets.QWidget):
self.first = False
if __name__ == "__main__":
- from PyQt4 import Qt
+ from PyQt5 import Qt
import sys
def valueChanged(frequency):
diff --git a/gr-utils/plot_tools/gr_plot_qt b/gr-utils/plot_tools/gr_plot_qt
index 5b9f9cf90a..aada9e0bba 100755
--- a/gr-utils/plot_tools/gr_plot_qt
+++ b/gr-utils/plot_tools/gr_plot_qt
@@ -9,13 +9,13 @@ except ImportError:
raise SystemExit(1)
try:
- from PyQt4 import Qt, QtCore, QtGui
+ from PyQt5 import Qt, QtCore, QtGui
except ImportError:
- print("Please install PyQt4 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
+ print("Please install PyQt5 to run this script (http://www.riverbankcomputing.co.uk/software/pyqt/download)")
raise SystemExit(1)
try:
- import PyQt4.Qwt5 as Qwt
+ import PyQt5.Qwt as Qwt
except ImportError:
print("Please install PyQwt5 to run this script (http://pyqwt.sourceforge.net/)")
raise SystemExit(1)
diff --git a/gr-utils/plot_tools/pyqt_filter.py b/gr-utils/plot_tools/pyqt_filter.py
index 0c781f2347..d56e45a056 100644
--- a/gr-utils/plot_tools/pyqt_filter.py
+++ b/gr-utils/plot_tools/pyqt_filter.py
@@ -7,7 +7,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
@@ -431,5 +431,5 @@ class Ui_MainWindow(object):
self.action_open.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+O", None, QtGui.QApplication.UnicodeUTF8))
#from qwt_plot import QwtPlot
-from PyQt4.Qwt5 import QwtPlot
+from PyQt5.Qwt import QwtPlot
diff --git a/gr-utils/plot_tools/pyqt_plot.py b/gr-utils/plot_tools/pyqt_plot.py
index bec30c32ad..2d4df6c5a7 100644
--- a/gr-utils/plot_tools/pyqt_plot.py
+++ b/gr-utils/plot_tools/pyqt_plot.py
@@ -6,7 +6,7 @@
#
# WARNING! All changes made in this file will be lost!
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
@@ -268,4 +268,4 @@ class Ui_MainWindow(object):
self.action_exit.setText(_translate("MainWindow", "E&xit", None))
self.action_reload.setText(_translate("MainWindow", "&Reload", None))
-from PyQt4 import Qwt5
+from PyQt5 import Qwt
diff --git a/gr-zeromq/examples/python/fixui4py.sh b/gr-zeromq/examples/python/fixui4py.sh
index d2978000bf..a66e52e3a8 100755
--- a/gr-zeromq/examples/python/fixui4py.sh
+++ b/gr-zeromq/examples/python/fixui4py.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-sed -i 's/qwt_plot.h/PyQt4.Qwt5.Qwt/' $1
+sed -i 's/qwt_plot.h/PyQt5.Qwt5.Qwt/' $1
diff --git a/gr-zeromq/examples/python/gui.py b/gr-zeromq/examples/python/gui.py
index 7d19735482..3105470ec7 100644
--- a/gr-zeromq/examples/python/gui.py
+++ b/gr-zeromq/examples/python/gui.py
@@ -14,8 +14,8 @@ from gnuradio.eng_arg import eng_float, intx
import gui
import sys
import os
-from PyQt4 import Qt, QtGui, QtCore, uic
-import PyQt4.Qwt5 as Qwt
+from PyQt5 import Qt, QtGui, QtCore, uic
+import PyQt5.Qwt5 as Qwt
from gnuradio import zeromq
import signal
diff --git a/gr-zeromq/examples/python/main_window.ui b/gr-zeromq/examples/python/main_window.ui
index 14f810e67d..02233f95bd 100644
--- a/gr-zeromq/examples/python/main_window.ui
+++ b/gr-zeromq/examples/python/main_window.ui
@@ -191,7 +191,7 @@
<customwidget>
<class>QwtPlot</class>
<extends>QFrame</extends>
- <header>PyQt4.Qwt5.Qwt</header>
+ <header>PyQt5.Qwt5.Qwt</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/grc/tests/resources/file3.block.yml b/grc/tests/resources/file3.block.yml
index 592ad94f6c..42712c5eb0 100644
--- a/grc/tests/resources/file3.block.yml
+++ b/grc/tests/resources/file3.block.yml
@@ -37,7 +37,7 @@ asserts:
- ${value in (true, false)}
templates:
- imports: from PyQt4 import Qt
+ imports: from PyQt5 import Qt
var_make: self.${id} = ${id} = ${value}
callbacks:
- self.set_${id}(${value})