diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-30 16:58:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-02 07:09:40 +0000 |
| commit | c135f4a2539837248a46e8ac37f50a975255a2a5 (patch) | |
| tree | b6c71414fe50c396adf8e0ff092897eb295762ca /cmake/FindQt5.cmake | |
| parent | 1cd87a05b53d69d75f4abea34033af2acf26982a (diff) | |
cmake build: Fix documentation generation with Qt6
qhelpgenerator moved to a separate package "Tools" which doesn't exist in Qt5.
Task-number: QTCREATORBUG-24098
Change-Id: If7d0d638d6cee27f9154141ca415fb412745d1ee
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake/FindQt5.cmake')
| -rw-r--r-- | cmake/FindQt5.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake index 60aa906ac9..f18745e598 100644 --- a/cmake/FindQt5.cmake +++ b/cmake/FindQt5.cmake @@ -26,7 +26,9 @@ find_package(Qt6 ${Qt5_FIND_VERSION} CONFIG COMPONENTS Core QUIET) if (NOT Qt6_FOUND) # remove Core5Compat from components to find in Qt5, but add a dummy target, # which unfortunately cannot start with "Qt6::" + # also remove Tools, where some tools have moved in Qt6, e.g. from Help list(REMOVE_ITEM Qt5_FIND_COMPONENTS Core5Compat) + list(REMOVE_ITEM Qt5_FIND_COMPONENTS Tools) find_package(Qt5 ${Qt5_FIND_VERSION} CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS}) if (NOT TARGET Qt6Core5Compat) add_library(Qt6Core5Compat INTERFACE) |