diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-11-13 15:21:58 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-11-15 15:40:37 -0800 |
| commit | d305018cbeb87e8a39ac67f6775e73914576fdfa (patch) | |
| tree | 5df134613e4726d9a1b5fa2dc9dae4943b9de556 /gr-qtgui/python/qtgui | |
| parent | 03e3a368eb28043cda924397874e572fc8af9c38 (diff) | |
qtgui: Disallow use of Qt4
Qt5 is now required. Note that many applications and examples requiring
Qt are currently broken, this does not fix any of them, it just sets up
our CMake environment so we can start fixing them.
Diffstat (limited to 'gr-qtgui/python/qtgui')
| -rw-r--r-- | gr-qtgui/python/qtgui/CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index 900531d211..b1a6555630 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2010-2012 Free Software Foundation, Inc. +# Copyright 2010-2012,2018 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,11 +20,7 @@ ######################################################################## include(GrPython) -if (DESIRED_QT_VERSION MATCHES 4) - set(PY_QT_IMPORT "from PyQt4 import Qt, QtCore, QtGui as QtWidgets") -else() - set(PY_QT_IMPORT "from PyQt5 import Qt, QtCore, QtWidgets") -endif() +set(PY_QT_IMPORT "from PyQt5 import Qt, QtCore, QtWidgets") configure_file(range.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/range.py" @ONLY) configure_file(util.py.cmakein "${CMAKE_CURRENT_BINARY_DIR}/util.py" @ONLY) |