From: Uwe Hermann <redacted>
Date: Sun, 25 Mar 2018 19:02:48 +0000 (+0200)
Subject: CMakeLists.txt: Only add Qt5PlatformSupport for Qt < 5.8.0.
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=356fb5c0c76f6b3a29f32250d665780eec4c980d;hp=30677c1392b54604b01558cf29b44572731659fc

CMakeLists.txt: Only add Qt5PlatformSupport for Qt < 5.8.0.

Qt5PlatformSupport was removed in Qt 5.8.0.
---

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)