From 356fb5c0c76f6b3a29f32250d665780eec4c980d Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 25 Mar 2018 21:02:48 +0200 Subject: [PATCH 1/1] CMakeLists.txt: Only add Qt5PlatformSupport for Qt < 5.8.0. Qt5PlatformSupport was removed in Qt 5.8.0. --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8b4d6ad..a2f12102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,12 +428,15 @@ endif() if(WIN32) # On Windows we need to statically link the libqsvg imageformat # plugin (and the QtSvg component) for SVG graphics/icons to work. - # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport, and all - # Qt libs and their dependencies. + # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport (only for + # Qt < 5.8.0), and all Qt libs and their dependencies. add_definitions(-DQT_STATICPLUGIN) list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin) list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin) - list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport ${QT5ALL_LDFLAGS}) + if(Qt5Gui_VERSION VERSION_LESS 5.8.0) + list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport) + endif() + list(APPEND PULSEVIEW_LINK_LIBS ${QT5ALL_LDFLAGS}) endif() if(ANDROID) -- 2.30.2