diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-04-28 10:53:12 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2016-04-28 12:04:12 -0400 |
| commit | ff85dcbaa9a8e2464812f481c329e483d0454402 (patch) | |
| tree | 171fefde83725be7e92c3710dee8a93200909f53 | |
| parent | 100abdfaeab57ac92cad9d1358e328224e0c1990 (diff) | |
qtgui: Fixes for edit_box_msg to work with QT5.
| -rw-r--r-- | gr-qtgui/examples/c++/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_edit_box_msg.xml | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/edit_box_msg_impl.cc | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/gr-qtgui/examples/c++/CMakeLists.txt b/gr-qtgui/examples/c++/CMakeLists.txt index ad84287367..796c292b81 100644 --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -36,9 +36,10 @@ list(APPEND QTGUI_LIBRARIES 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}) diff --git a/gr-qtgui/grc/qtgui_edit_box_msg.xml b/gr-qtgui/grc/qtgui_edit_box_msg.xml index c7c758a612..d77a4b3e1b 100644 --- a/gr-qtgui/grc/qtgui_edit_box_msg.xml +++ b/gr-qtgui/grc/qtgui_edit_box_msg.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Message Edit Box</name> <key>qtgui_edit_box_msg</key> - <import>from PyQt4 import Qt</import> + <import>from PyQt5 import Qt</import> <import>from gnuradio import qtgui</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index e0c5f64b3d..e0b5f256b6 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -65,10 +65,6 @@ namespace gr { 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); } |