From: Uwe Hermann Date: Sat, 7 Sep 2019 17:25:36 +0000 (+0200) Subject: Bump required Qt version to >= 5.3. X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=5675292c804dec6e6f2becd9876594ccb6fcec7c;p=pulseview.git Bump required Qt version to >= 5.3. This is necessary since we now use QSignalBlocker, which was introduced in Qt 5.3. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 76e12935..9835094f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,14 +101,14 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS}) set(CMAKE_AUTOMOC TRUE) -find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED) +find_package(Qt5 5.3 COMPONENTS Core Gui Widgets Svg REQUIRED) if(WIN32) # MXE workaround: Use pkg-config to find Qt5 libs. # https://github.com/mxe/mxe/issues/1642 # Not required (and doesn't work) on MSYS2. if(NOT DEFINED ENV{MSYSTEM}) - pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg) + pkg_check_modules(QT5ALL REQUIRED Qt5Widgets>=5.3 Qt5Gui>=5.3 Qt5Svg>=5.3) endif() endif() diff --git a/INSTALL b/INSTALL index aba3cce7..dce8eb64 100644 --- a/INSTALL +++ b/INSTALL @@ -16,7 +16,7 @@ Requirements - libglib >= 2.28.0 - glibmm-2.4 (>= 2.28.0) - gstreamermm-1.0 (>= 1.8.0) - - Qt5 (including the following components): + - Qt5 (>= 5.3), including the following components: - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg - libboost >= 1.55 (including the following libs): - libboost-system