Skip to content

Commit c48504e

Browse files
AndreSchroeder-TomTomschra
authored andcommitted
Drop Qt4 support
The background for this diff is that we want to specify Qt as a dependency in the package.xml. However, it's only possible to specify either Qt4 or Qt5. Thus we drop the support for Qt4 so that we can specify Qt5 as a dependency in package.xml. ROS melodic (which is already two years old) uses Qt5, thus this diff shouldn't be too problematic.
1 parent 3d631d1 commit c48504e

File tree

2 files changed

+18
-27
lines changed

2 files changed

+18
-27
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package rviz_satellite
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
Forthcoming
6+
-----------
7+
* Drop Qt4 support
8+
59
1.3.0 (2020-04-17)
610
------------------
711
* Fix setting the fixed frame

CMakeLists.txt

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
2121

2222
catkin_package(CATKIN_DEPENDS nav_msgs sensor_msgs)
2323

24-
if (rviz_QT_VERSION VERSION_LESS "5")
25-
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
26-
include(${QT_USE_FILE})
27-
else()
28-
find_package(Qt5 COMPONENTS Core Gui Network Concurrent REQUIRED)
29-
endif()
24+
find_package(Qt5 COMPONENTS Core Gui Network Concurrent REQUIRED)
3025

3126
set(${PROJECT_NAME}_SOURCES
3227
src/aerialmap_display.cpp
@@ -40,27 +35,19 @@ set(${PROJECT_NAME}_HEADERS
4035
)
4136

4237
# invoke MOC and UI/ include Qt headers/ link Qt libraries
43-
if (rviz_QT_VERSION VERSION_LESS "5")
44-
qt4_wrap_cpp(${PROJECT_NAME}_MOCSrcs ${${PROJECT_NAME}_HEADERS})
45-
include_directories(${Qt4_INCLUDE_DIR})
46-
link_libraries(
47-
${QT_LIBRARIES}
48-
)
49-
else()
50-
qt5_wrap_cpp(${PROJECT_NAME}_MOCSrcs ${${PROJECT_NAME}_HEADERS})
51-
include_directories(
52-
${Qt5Core_INCLUDE_DIRS}
53-
${Qt5Gui_INCLUDE_DIRS}
54-
${Qt5Network_INCLUDE_DIRS}
55-
${Qt5Concurrent_INCLUDE_DIRS}
56-
)
57-
link_libraries(
58-
${Qt5Core_LIBRARIES}
59-
${Qt5Gui_LIBRARIES}
60-
${Qt5Network_LIBRARIES}
61-
${Qt5Concurrent_LIBRARIES}
62-
)
63-
endif()
38+
qt5_wrap_cpp(${PROJECT_NAME}_MOCSrcs ${${PROJECT_NAME}_HEADERS})
39+
include_directories(
40+
${Qt5Core_INCLUDE_DIRS}
41+
${Qt5Gui_INCLUDE_DIRS}
42+
${Qt5Network_INCLUDE_DIRS}
43+
${Qt5Concurrent_INCLUDE_DIRS}
44+
)
45+
link_libraries(
46+
${Qt5Core_LIBRARIES}
47+
${Qt5Gui_LIBRARIES}
48+
${Qt5Network_LIBRARIES}
49+
${Qt5Concurrent_LIBRARIES}
50+
)
6451

6552
# Other includes
6653
include_directories(

0 commit comments

Comments
 (0)