]> sigrok.org Git - pulseview.git/commitdiff
CMakeLists.txt: Only add Qt5PlatformSupport for Qt < 5.8.0.
authorUwe Hermann <redacted>
Sun, 25 Mar 2018 19:02:48 +0000 (21:02 +0200)
committerUwe Hermann <redacted>
Sun, 25 Mar 2018 19:03:59 +0000 (21:03 +0200)
Qt5PlatformSupport was removed in Qt 5.8.0.

CMakeLists.txt

index c8b4d6ad08740a1d9404db304e9d182bff80cf25..a2f12102501b0de26687732f448a655e2a036de7 100644 (file)
@@ -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)