diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-10-28 17:02:31 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-10-28 17:14:57 +0100 |
| commit | 1f6543902d18a05dbb87dd361a169a7cdb3da731 (patch) | |
| tree | d6910bdb42b493c890e330270b89c57108f5a9f7 /cmake/QtDocsHelpers.cmake | |
| parent | 5c2656cfb60a3308fde3802825176fc80ed1a262 (diff) | |
Fix qdoc builds for non-top-level developer builds
Fixes a regression introduced in commit 748b3b9c8971e35 for builds
that are both not a QT_SUPERBUILD and not QT_WILL_INSTALL.
Change-Id: I52b920176a2696fa6206b89b2b69ae1a7f3fbc25
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtDocsHelpers.cmake')
| -rw-r--r-- | cmake/QtDocsHelpers.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index f65fd4a07d..77ec8c3f01 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -33,10 +33,8 @@ function(qt_internal_add_docs) if(QT_SUPERBUILD) set(doc_tools_dir "${QtBase_BINARY_DIR}/${INSTALL_BINDIR}") - elseif(QT_WILL_INSTALL) - set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}") else() - set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}") + set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}") endif() set(qdoc_bin "${doc_tools_dir}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") |