diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 16:33:37 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-01 12:09:33 +0200 |
| commit | 67afac53feda6b05edf7a17dd506d378500ba9ae (patch) | |
| tree | aabef27f30acbb62c2d0b22e826e4b1cb29cd19a /src/qdoc/CMakeLists.txt | |
| parent | 092f23cdacb5dd0ad2307cd4c18546054f7f5245 (diff) | |
| download | qttools-67afac53feda6b05edf7a17dd506d378500ba9ae.tar.gz | |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I84f5fc4eb26f95d81ce5b5b8cc72706bb9185026
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qdoc/CMakeLists.txt')
| -rw-r--r-- | src/qdoc/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index f1828503e..89b501fc7 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -12,7 +12,7 @@ endif() ##################################################################### qt_get_tool_target_name(target_name qdoc) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Documentation Compiler" TOOLS_TARGET Tools # special case SOURCES @@ -118,12 +118,12 @@ qt_add_tool(${target_name} #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap: # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" -qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::QmlDevToolsPrivate ) -qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate +qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate DEFINES QT_NO_DECLARATIVE ) @@ -131,7 +131,7 @@ qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate #### 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_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_ +qt_internal_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_ LINK_OPTIONS "/STACK:4194304" ) @@ -152,7 +152,7 @@ qt_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_ #### Keys ignored in scope 12:.:.:qdoc.pro:QMAKE_HOST.os___equals___Windows: # CMAKE_BIN_SUFFIX = ".exe" -qt_add_docs(${target_name} +qt_internal_add_docs(${target_name} doc/config/qdoc.qdocconf ) |