From 587657d47bfaab3af481784565e90a1a0ea3c1e2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 21 May 2021 14:05:32 +0200 Subject: [PATCH] CMake: Fix build with Qt 5.14 qlitehtml links against "Qt${QT_VERSION_MAJOR}::Widgets", but Qt Creator uses find_package with "Qt5" not "QT", so "QT_VERSION_MAJOR" is not defined/empty. For Qt 5.15 that is not a problem because that defines unversioned aliases "Qt::Widgets". For Qt 5.14 we must make sure it is set though. Change-Id: Icb0a195afadae3cdb164d28f15340c0a5e156543 Reviewed-by: Jarek Kobus Reviewed-by: Christian Stenger Reviewed-by: Qt CI Bot --- src/libs/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 920f1607dd5..9abc90d1550 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -30,6 +30,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt) set(QLITEHTML_DEVEL_COMPONENT Devel) set(QLITEHTML_DEVEL_EXCLUDE_FROM_ALL ON) set(QLITEHTML_HEADER_PATH "${IDE_HEADER_INSTALL_PATH}/src/lib/qlitehtml") + set(QT_VERSION_MAJOR ${Qt5_VERSION_MAJOR}) add_subdirectory(qlitehtml/src) endif() if(TARGET qlitehtml)