additionally support Qt5

rqt_bag/package.xml

@@ -16,6 +16,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <run_depend version_gte="0.2.19">python_qt_binding</run_depend>
   <run_depend>python-rospkg</run_depend>
   <run_depend>rosbag</run_depend>
   <run_depend>rosgraph_msgs</run_depend>

rqt_bag/src/rqt_bag/bag_timeline.py

@@ -37,7 +37,7 @@
 
 
 from python_qt_binding.QtCore import Qt, QTimer, qWarning, Signal
-from python_qt_binding.QtGui import QGraphicsScene, QMessageBox
+from python_qt_binding.QtWidgets import QGraphicsScene, QMessageBox
 
 import bag_helper
 

rqt_bag/src/rqt_bag/bag_widget.py

@@ -38,7 +38,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import Qt, qWarning, Signal
-from python_qt_binding.QtGui import QFileDialog, QGraphicsView, QIcon, QWidget
+from python_qt_binding.QtGui import QIcon
+from python_qt_binding.QtWidgets import QFileDialog, QGraphicsView, QWidget
 
 import rosbag
 import bag_helper

rqt_bag/src/rqt_bag/message_listener_thread.py

@@ -38,7 +38,7 @@
 
 class ListenerEvent(QEvent):
     def __init__(self, data):
-        super(ListenerEvent, self).__init__(1024)  # userdefined event constant
+        super(ListenerEvent, self).__init__(QEvent.User)
         self.data = data
 
 

rqt_bag/src/rqt_bag/plugins/raw_view.py

@@ -37,7 +37,7 @@
 import math
 
 from python_qt_binding.QtCore import Qt
-from python_qt_binding.QtGui import QApplication, QAbstractItemView, QSizePolicy, QTreeWidget, QTreeWidgetItem
+from python_qt_binding.QtWidgets import QApplication, QAbstractItemView, QSizePolicy, QTreeWidget, QTreeWidgetItem, QWidget
 from .topic_message_view import TopicMessageView
 
 
@@ -113,7 +113,7 @@ def set_message(self, msg):
                     else:
                         item.setExpanded(False)
         self._msg = msg
-        self.update()
+        QWidget.update(self)
 
     # Keyboard handler
     def on_key_press(self, event):

rqt_bag/src/rqt_bag/plugins/timeline_renderer.py

@@ -41,6 +41,7 @@ class TimelineRenderer(QObject):
     @type  msg_combine_px: float
     """
     def __init__(self, timeline, msg_combine_px=1.5):
+        super(TimelineRenderer, self).__init__()
         self.timeline = timeline
         self.msg_combine_px = msg_combine_px
 

rqt_bag/src/rqt_bag/plugins/topic_message_view.py

@@ -31,7 +31,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 from .message_view import MessageView
 
-from python_qt_binding.QtGui import QAction, QIcon, QToolBar
+from python_qt_binding.QtGui import QIcon
+from python_qt_binding.QtWidgets import QAction, QToolBar
 
 
 class TopicMessageView(MessageView):

rqt_bag/src/rqt_bag/timeline_frame.py

@@ -33,8 +33,8 @@
 
 from python_qt_binding.QtCore import qDebug, QPointF, QRectF, Qt, qWarning, Signal
 from python_qt_binding.QtGui import QBrush, QCursor, QColor, QFont, \
-                                    QFontMetrics, QGraphicsItem, QPen, \
-                                    QPolygonF
+                                    QFontMetrics, QPen, QPolygonF
+from python_qt_binding.QtWidgets import QGraphicsItem
 import rospy
 
 import bisect

rqt_bag/src/rqt_bag/timeline_menu.py

@@ -30,7 +30,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from python_qt_binding.QtGui import QVBoxLayout, QMenu, QWidget, QDockWidget
+from python_qt_binding.QtWidgets import QVBoxLayout, QMenu, QWidget, QDockWidget
 
 class TopicPopupWidget(QWidget):
     def __init__(self, popup_name, timeline, viewer_type, topic):

rqt_bag/src/rqt_bag/topic_selection.py

@@ -33,7 +33,7 @@
 import rosgraph
 
 from python_qt_binding.QtCore import Qt, Signal
-from python_qt_binding.QtGui import QWidget, QHBoxLayout, QVBoxLayout, QCheckBox, QScrollArea, QPushButton
+from python_qt_binding.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QCheckBox, QScrollArea, QPushButton
 
 class TopicSelection(QWidget):
 

rqt_bag_plugins/src/rqt_bag_plugins/image_timeline_renderer.py

@@ -34,7 +34,11 @@
 
 # HACK workaround for upstream pillow issue python-pillow/Pillow#400
 import sys
-if 'PyQt5' in sys.modules:
+from python_qt_binding import QT_BINDING_MODULES
+if (
+    not QT_BINDING_MODULES['QtCore'].__name__.startswith('PyQt5') and
+    'PyQt5' in sys.modules
+):
     sys.modules['PyQt5'] = None
 from PIL import Image
 from PIL.ImageQt import ImageQt

rqt_bag_plugins/src/rqt_bag_plugins/image_view.py

@@ -34,14 +34,19 @@
 
 # HACK workaround for upstream pillow issue python-pillow/Pillow#400
 import sys
-if 'PyQt5' in sys.modules:
+from python_qt_binding import QT_BINDING_MODULES
+if (
+    not QT_BINDING_MODULES['QtCore'].__name__.startswith('PyQt5') and
+    'PyQt5' in sys.modules
+):
     sys.modules['PyQt5'] = None
 from PIL.ImageQt import ImageQt
 
 from rqt_bag import TopicMessageView
 import image_helper
 
-from python_qt_binding.QtGui import QGraphicsScene, QGraphicsView, QPixmap
+from python_qt_binding.QtGui import QPixmap
+from python_qt_binding.QtWidgets import QGraphicsScene, QGraphicsView
 
 
 class ImageView(TopicMessageView):

rqt_bag_plugins/src/rqt_bag_plugins/plot_view.py

@@ -71,7 +71,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import Qt, qWarning, Signal
-from python_qt_binding.QtGui import QWidget, QPushButton, QTreeWidget, QTreeWidgetItem, QSizePolicy, QDoubleValidator, QIcon
+from python_qt_binding.QtGui import QDoubleValidator, QIcon
+from python_qt_binding.QtWidgets import QWidget, QPushButton, QTreeWidget, QTreeWidgetItem, QSizePolicy
 
 from rqt_plot.data_plot import DataPlot
 

rqt_console/package.xml

@@ -14,6 +14,7 @@
   <buildtool_depend>catkin</buildtool_depend>
 
   <run_depend>python-rospkg</run_depend>
+  <run_depend version_gte="0.2.19">python_qt_binding</run_depend>
   <run_depend>roslib</run_depend>
   <run_depend>rospy</run_depend>
   <run_depend>rqt_gui</run_depend>

rqt_console/src/rqt_console/console_settings_dialog.py

@@ -33,7 +33,7 @@
 import os
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QDialog
+from python_qt_binding.QtWidgets import QDialog
 
 from rqt_logger_level.logger_level_widget import LoggerLevelWidget
 from rqt_logger_level.logger_level_service_caller import LoggerLevelServiceCaller

rqt_console/src/rqt_console/console_widget.py

@@ -33,7 +33,8 @@
 import os
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QApplication, QCursor, QFileDialog, QHeaderView,QIcon, QMenu, QMessageBox, QTableView, QWidget
+from python_qt_binding.QtGui import QCursor, QIcon
+from python_qt_binding.QtWidgets import QApplication, QFileDialog, QHeaderView, QMenu, QMessageBox, QTableView, QWidget
 from python_qt_binding.QtCore import QRegExp, Qt, qWarning
 
 import time

rqt_console/src/rqt_console/filters/custom_filter_widget.py

@@ -35,7 +35,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import Qt
-from python_qt_binding.QtGui import QPalette, QWidget
+from python_qt_binding.QtGui import QPalette
+from python_qt_binding.QtWidgets import QWidget
 
 from rqt_py_common.ini_helper import pack, unpack
 

rqt_console/src/rqt_console/filters/filter_wrapper_widget.py

@@ -34,7 +34,8 @@
 import rospkg
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QIcon, QWidget
+from python_qt_binding.QtGui import QIcon
+from python_qt_binding.QtWidgets import QWidget
 
 
 class FilterWrapperWidget(QWidget):

rqt_console/src/rqt_console/filters/list_filter_widget.py

@@ -35,7 +35,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import Qt
-from python_qt_binding.QtGui import QPalette, QWidget
+from python_qt_binding.QtGui import QPalette
+from python_qt_binding.QtWidgets import QWidget
 
 from rqt_py_common.ini_helper import pack, unpack
 

rqt_console/src/rqt_console/filters/text_filter_widget.py

@@ -34,7 +34,7 @@
 import rospkg
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QWidget
+from python_qt_binding.QtWidgets import QWidget
 
 
 class TextFilterWidget(QWidget):

rqt_console/src/rqt_console/filters/time_filter_widget.py

@@ -36,7 +36,7 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import QDateTime
-from python_qt_binding.QtGui import QWidget
+from python_qt_binding.QtWidgets import QWidget
 
 
 class TimeFilterWidget(QWidget):

rqt_console/src/rqt_console/message_proxy_model.py

@@ -31,7 +31,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from python_qt_binding.QtCore import Qt, qWarning
-from python_qt_binding.QtGui import QBrush, QColor, QSortFilterProxyModel
+try:
+    from python_qt_binding.QtCore import QSortFilterProxyModel  # Qt 5
+except ImportError:
+    from python_qt_binding.QtGui import QSortFilterProxyModel  # Qt 4
+from python_qt_binding.QtGui import QBrush, QColor
 
 from .filters.filter_collection import FilterCollection
 from .message import Message
@@ -111,7 +115,7 @@ def handle_highlight_filters_changed(self):
             self.invalidateFilter()
         else:
             self.invalidateFilter()
-            self.dataChanged.emit(self.index(0, 0), self.index(self.rowCount() - 1, self.columnCount() - 1))
+            self.dataChanged.emit(self.index(0, 0), self.index(self.rowCount() - 1, self.columnCount() - 1), [])
 
     def add_exclude_filter(self, newfilter):
         self._exclude_filters.append(newfilter)

rqt_console/src/rqt_console/text_browse_dialog.py

@@ -33,7 +33,7 @@
 import os
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QDialog
+from python_qt_binding.QtWidgets import QDialog
 
 
 class TextBrowseDialog(QDialog):

rqt_dep/package.xml

@@ -14,6 +14,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <run_depend version_gte="0.2.19">python_qt_binding</run_depend>
   <run_depend>python-rospkg</run_depend>
   <run_depend>qt_dotgraph</run_depend>
   <run_depend>qt_gui</run_depend>

rqt_dep/src/rqt_dep/ros_pack_graph.py

@@ -38,7 +38,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import QFile, QIODevice, Qt, Signal, Slot, QAbstractListModel
-from python_qt_binding.QtGui import QFileDialog, QGraphicsScene, QIcon, QImage, QPainter, QWidget, QCompleter
+from python_qt_binding.QtGui import  QIcon, QImage, QPainter
+from python_qt_binding.QtWidgets import QFileDialog, QGraphicsScene, QWidget, QCompleter
 from python_qt_binding.QtSvg import QSvgGenerator
 
 import rosservice

rqt_graph/package.xml

@@ -21,6 +21,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <run_depend version_gte="0.2.19">python_qt_binding</run_depend>
   <run_depend>python-rospkg</run_depend>
   <run_depend>qt_dotgraph</run_depend>
   <run_depend>rosgraph</run_depend>

rqt_graph/src/rqt_graph/interactive_graphics_view.py

@@ -31,7 +31,8 @@
 from __future__ import division
 
 from python_qt_binding.QtCore import QPointF, QRectF, Qt
-from python_qt_binding.QtGui import QGraphicsView, QTransform
+from python_qt_binding.QtGui import QTransform
+from python_qt_binding.QtWidgets import QGraphicsView
 
 
 class InteractiveGraphicsView(QGraphicsView):

rqt_graph/src/rqt_graph/ros_graph.py

@@ -34,7 +34,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import QAbstractListModel, QFile, QIODevice, Qt, Signal
-from python_qt_binding.QtGui import QCompleter, QFileDialog, QGraphicsScene, QIcon, QImage, QPainter, QWidget
+from python_qt_binding.QtGui import QIcon, QImage, QPainter
+from python_qt_binding.QtWidgets import QCompleter, QFileDialog, QGraphicsScene, QWidget
 from python_qt_binding.QtSvg import QSvgGenerator
 
 import rosgraph.impl.graph

rqt_image_view/CMakeLists.txt

@@ -4,9 +4,12 @@ project(rqt_image_view)
 # Load catkin and all dependencies required for this package
 find_package(catkin REQUIRED COMPONENTS rqt_gui rqt_gui_cpp image_transport sensor_msgs cv_bridge)
 
-find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-
-include(${QT_USE_FILE})
+if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
+  find_package(Qt5Widgets REQUIRED)
+else()
+  find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
+  include(${QT_USE_FILE})
+endif()
 
 set(rqt_image_view_SRCS
   src/rqt_image_view/image_view.cpp
@@ -34,12 +37,22 @@ catkin_package(
 )
 catkin_python_setup()
 
-qt4_wrap_cpp(rqt_image_view_MOCS ${rqt_image_view_HDRS})
-qt4_wrap_ui(rqt_image_view_UIS_H ${rqt_image_view_UIS})
+if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
+  qt5_wrap_cpp(rqt_image_view_MOCS ${rqt_image_view_HDRS})
+  qt5_wrap_ui(rqt_image_view_UIS_H ${rqt_image_view_UIS})
+else()
+  qt4_wrap_cpp(rqt_image_view_MOCS ${rqt_image_view_HDRS})
+  qt4_wrap_ui(rqt_image_view_UIS_H ${rqt_image_view_UIS})
+endif()
 
 include_directories(${rqt_image_view_INCLUDE_DIRECTORIES} ${catkin_INCLUDE_DIRS})
 add_library(${PROJECT_NAME} ${rqt_image_view_SRCS} ${rqt_image_view_MOCS} ${rqt_image_view_UIS_H})
-target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
+if("${qt_gui_cpp_USE_QT_MAJOR_VERSION} " STREQUAL "5 ")
+  target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
+else()
+  target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+endif()
 
 find_package(class_loader)
 class_loader_hide_library_symbols(${PROJECT_NAME})

rqt_image_view/include/rqt_image_view/ratio_layouted_frame.h

@@ -56,7 +56,7 @@ class RatioLayoutedFrame
 
 public:
 
-  RatioLayoutedFrame(QWidget* parent, Qt::WFlags flags = 0);
+  RatioLayoutedFrame(QWidget* parent, Qt::WindowFlags flags = 0);
 
   virtual ~RatioLayoutedFrame();
 

rqt_image_view/src/rqt_image_view/ratio_layouted_frame.cpp

@@ -36,7 +36,7 @@
 
 namespace rqt_image_view {
 
-RatioLayoutedFrame::RatioLayoutedFrame(QWidget* parent, Qt::WFlags flags)
+RatioLayoutedFrame::RatioLayoutedFrame(QWidget* parent, Qt::WindowFlags flags)
   : QFrame()
   , aspect_ratio_(4, 3)
 {

rqt_launch/package.xml

@@ -18,6 +18,7 @@
 
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>rqt_py_common</build_depend>
+  <run_depend version_gte="0.2.19">python_qt_binding</run_depend>
   <run_depend>roslaunch</run_depend>
   <run_depend>rospy</run_depend>
   <run_depend>rqt_console</run_depend>

rqt_launch/src/rqt_launch/launch_widget.py

@@ -37,8 +37,8 @@
 
 from python_qt_binding import loadUi
 from python_qt_binding.QtCore import QModelIndex, Signal
-from python_qt_binding.QtGui import QDialog, QStandardItem, \
-                                    QStandardItemModel
+from python_qt_binding.QtGui import QStandardItem, QStandardItemModel
+from python_qt_binding.QtWidgets import QDialog
 from rosgraph import rosenv
 import roslaunch
 from roslaunch.core import RLException

rqt_launch/src/rqt_launch/node_delegate.py

@@ -33,7 +33,7 @@
 # Author: Isaac Saito
 
 from python_qt_binding.QtCore import Qt
-from python_qt_binding.QtGui import QStyledItemDelegate
+from python_qt_binding.QtWidgets import QStyledItemDelegate
 import rospkg
 
 from rqt_launch.node_widget import NodeWidget

rqt_launch/src/rqt_launch/node_widget.py

@@ -35,7 +35,8 @@
 import os
 
 from python_qt_binding import loadUi
-from python_qt_binding.QtGui import QIcon, QLineEdit, QWidget
+from python_qt_binding.QtGui import QIcon
+from python_qt_binding.QtWidgets import QLineEdit, QWidget
 import rospy
 
 from rqt_launch.name_surrogate import NamesSurrogate