From 090bd23108c82d3044bbe4d41abde4d4077c0cc82d7e5571b42a6a3c185613c9 Mon Sep 17 00:00:00 2001 From: Wojciech Kazubski Date: Fri, 20 Sep 2019 12:00:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=56 --- ...es-for-edit_box_msg-to-work-with-QT5.patch | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch diff --git a/qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch b/qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch new file mode 100644 index 0000000..23fa48d --- /dev/null +++ b/qt5-maint-0007-qtgui-Fixes-for-edit_box_msg-to-work-with-QT5.patch @@ -0,0 +1,73 @@ +From 1dae9e033016f35416cb433a8a129b4f011eb8c1 Mon Sep 17 00:00:00 2001 +From: Tom Rondeau +Date: Thu, 28 Apr 2016 10:53:12 -0400 +Subject: [PATCH 07/22] qtgui: Fixes for edit_box_msg to work with QT5. + +--- + gr-qtgui/examples/c++/CMakeLists.txt | 20 +++++++++++--------- + gr-qtgui/grc/qtgui_edit_box_msg.xml | 2 +- + gr-qtgui/lib/edit_box_msg_impl.cc | 4 ---- + 3 files changed, 12 insertions(+), 14 deletions(-) + +--- a/gr-qtgui/examples/c++/CMakeLists.txt ++++ b/gr-qtgui/examples/c++/CMakeLists.txt +@@ -18,14 +18,14 @@ + # Boston, MA 02110-1301, USA. + + include_directories( +- ${GR_QTGUI_INCLUDE_DIRS} +- ${GR_ANALOG_INCLUDE_DIRS} +- ${GR_FILTER_INCLUDE_DIRS} +- ${GR_BLOCKS_INCLUDE_DIRS} +- ${GR_FFT_INCLUDE_DIRS} +- ${GNURADIO_RUNTIME_INCLUDE_DIRS} +- ${QT_INCLUDE_DIRS} +- ${Boost_INCLUDE_DIRS} ++ ${GR_QTGUI_INCLUDE_DIRS} ++ ${GR_ANALOG_INCLUDE_DIRS} ++ ${GR_FILTER_INCLUDE_DIRS} ++ ${GR_BLOCKS_INCLUDE_DIRS} ++ ${GR_FFT_INCLUDE_DIRS} ++ ${GNURADIO_RUNTIME_INCLUDE_DIRS} ++ ${Qt5Widgets_INCLUDE_DIRS} ++ ${Boost_INCLUDE_DIRS} + ) + + list(APPEND QTGUI_LIBRARIES +@@ -35,9 +35,11 @@ + gnuradio-blocks + gnuradio-fft + gnuradio-runtime ++ ${QWT_LIBRARY_DIRS} ++ ${Qt5Widgets_LIBRARIES} + ) + +-QT4_WRAP_CPP(qtgui_moc_sources display_qt.h) ++QT5_WRAP_CPP(qtgui_moc_sources display_qt.h) + add_executable(display_qt display_qt.cc ${qtgui_moc_sources}) + target_link_libraries(display_qt ${QTGUI_LIBRARIES}) + +--- a/gr-qtgui/grc/qtgui_edit_box_msg.xml ++++ b/gr-qtgui/grc/qtgui_edit_box_msg.xml +@@ -7,7 +7,7 @@ + + QT GUI Message Edit Box + qtgui_edit_box_msg +- from PyQt4 import Qt ++ from PyQt5 import Qt + from gnuradio import qtgui + import sip + #set $win = 'self._%s_win'%$id +--- a/gr-qtgui/lib/edit_box_msg_impl.cc ++++ b/gr-qtgui/lib/edit_box_msg_impl.cc +@@ -66,10 +66,6 @@ + d_qApplication = qApp; + } + else { +-#if QT_VERSION >= 0x040500 +- std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); +- QApplication::setGraphicsSystem(QString(style.c_str())); +-#endif + d_qApplication = new QApplication(d_argc, &d_argv); + } +