Skip to content

Commit

Permalink
Bump required Qt version (fixes #112) (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
sur5r authored Feb 6, 2021
1 parent 39c9676 commit 3c33e3e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ if (MINGW)
set (CMAKE_PREFIX_PATH ${MINGW_BASE_DIR} )
endif ()

find_package (Qt5Core 5.4 REQUIRED)
find_package (Qt5Widgets 5.4 REQUIRED)
find_package (Qt5PrintSupport 5.4 REQUIRED)
find_package (Qt5Xml 5.4 REQUIRED)
find_package (Qt5Svg 5.4 REQUIRED)
find_package (Qt5Core 5.6 REQUIRED)
find_package (Qt5Widgets 5.6 REQUIRED)
find_package (Qt5PrintSupport 5.6 REQUIRED)
find_package (Qt5Xml 5.6 REQUIRED)
find_package (Qt5Svg 5.6 REQUIRED)
find_package (Qt5LinguistTools)

if (WIN32)
Expand All @@ -128,7 +128,7 @@ find_package (GnuBarcode 0.98 QUIET)
find_package (LibQrencode 3.4 QUIET)
find_package (LibZint 2.6 EXACT QUIET)
# Unit testing support
find_package (Qt5Test 5.4 QUIET)
find_package (Qt5Test 5.6 QUIET)


#=======================================
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILD-INSTRUCTIONS-LINUX.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gLabels Linux Build Instructions

- g++
- CMake 2.8.12+
- Qt5 5.4+ Development Packages ( Qt5Core, Qt5Widgets, Qt5PrintSupport, Qt5Xml, Qt5Svg )
- Qt5 5.6+ Development Packages ( Qt5Core, Qt5Widgets, Qt5PrintSupport, Qt5Xml, Qt5Svg )
- zlib 1.2+ Development Package

> Even if the above library packages are installed, their corresponding development packages
Expand Down

0 comments on commit 3c33e3e

Please sign in to comment.