diff options
| author | Li Xinwei <1326710505@qq.com> | 2021-02-01 20:36:31 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-02 11:59:34 +0000 |
| commit | 77106abdb03fe8aa7437725c29150ea797f80048 (patch) | |
| tree | 718dcb402bdc61682fa1e7958bfbdeebfd343fde | |
| parent | 18d65f1c05d6ca871655c4923f1892a92ba7b28c (diff) | |
qdoc: Fix CMake CONDITION expression "win32-icc_x_ OR win32-msvc_x_"
"win32-icc_x_ OR win32-msvc_x_" never equals TRUE, even when using MSVC
or ICC compiler in Windows.
Change-Id: I8b72635754da9fdc534013e3f95b98f380b315d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 4a49f40ad8bd56962cc9efea6439a4f9b6ffb9f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index 9b2b801ae..88ffb0dfa 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -122,7 +122,7 @@ qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPri #### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath: # QMAKE_RPATHDIR = "$$CLANG_LIBDIR" -qt_internal_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_ +qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC LINK_OPTIONS "/STACK:4194304" ) |