From 6f40d8c2abd76d9f8bea6866ffb99cef08bcd803b4a11c8fe547c04abe8ac2af Mon Sep 17 00:00:00 2001 From: Wojciech Kazubski Date: Fri, 20 Sep 2019 12:01:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=60 --- ...-Re-introduce-some-Qt4-specific-code.patch | 191 ++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch diff --git a/qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch b/qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch new file mode 100644 index 0000000..e51b739 --- /dev/null +++ b/qt5-maint-0011-gr-qtgui-Re-introduce-some-Qt4-specific-code.patch @@ -0,0 +1,191 @@ +From 988c1520d5b6f763caa0164faef404185e7dbc85 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Tue, 21 Jun 2016 18:30:21 +0200 +Subject: [PATCH 11/22] gr-qtgui: Re-introduce some Qt4-specific code + +Signed-off-by: Paul Cercueil +--- + gr-qtgui/lib/const_sink_c_impl.cc | 4 ++++ + gr-qtgui/lib/freq_sink_c_impl.cc | 4 ++++ + gr-qtgui/lib/freq_sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/histogram_sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/sink_c_impl.cc | 4 ++++ + gr-qtgui/lib/sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++++ + gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/time_sink_c_impl.cc | 4 ++++ + gr-qtgui/lib/time_sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/vector_sink_f_impl.cc | 4 ++++ + gr-qtgui/lib/waterfall_sink_c_impl.cc | 4 ++++ + gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ++++ + 13 files changed, 52 insertions(+) + +--- a/gr-qtgui/lib/const_sink_c_impl.cc ++++ b/gr-qtgui/lib/const_sink_c_impl.cc +@@ -127,6 +127,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/freq_sink_c_impl.cc ++++ b/gr-qtgui/lib/freq_sink_c_impl.cc +@@ -156,6 +156,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/freq_sink_f_impl.cc ++++ b/gr-qtgui/lib/freq_sink_f_impl.cc +@@ -155,6 +155,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/histogram_sink_f_impl.cc ++++ b/gr-qtgui/lib/histogram_sink_f_impl.cc +@@ -115,6 +115,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/sink_c_impl.cc ++++ b/gr-qtgui/lib/sink_c_impl.cc +@@ -131,6 +131,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/sink_f_impl.cc ++++ b/gr-qtgui/lib/sink_f_impl.cc +@@ -131,6 +131,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc ++++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc +@@ -130,6 +130,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc ++++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc +@@ -128,6 +128,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/time_sink_c_impl.cc ++++ b/gr-qtgui/lib/time_sink_c_impl.cc +@@ -134,6 +134,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/time_sink_f_impl.cc ++++ b/gr-qtgui/lib/time_sink_f_impl.cc +@@ -129,6 +129,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/vector_sink_f_impl.cc ++++ b/gr-qtgui/lib/vector_sink_f_impl.cc +@@ -140,6 +140,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc ++++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc +@@ -159,6 +159,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } + +--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc ++++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc +@@ -155,6 +155,10 @@ + d_qApplication = qApp; + } + else { ++#if QT_VERSION >= 0x040500 && QT_VERSION < 0x050000 ++ 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); + } +