diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-21 14:05:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-21 14:02:18 +0000 |
| commit | 587657d47bfaab3af481784565e90a1a0ea3c1e2 (patch) | |
| tree | b869f622b629573475ca822bb59d6e0f96dc468d /src/libs/CMakeLists.txt | |
| parent | 8d5e9c3636097c5115111a9e2b23c913d0c30f8e (diff) | |
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 <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/libs/CMakeLists.txt')
| -rw-r--r-- | src/libs/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 920f1607dd..9abc90d155 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) |