summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <[email protected]>2022-02-16 11:59:06 +0100
committerKai Köhne <[email protected]>2022-02-16 17:41:43 +0100
commit3cd8099cfc902b4e9359cd63312e64994d76ad69 (patch)
treed177a60a02dd8e13124dde1926627aadbd57e2ae
parentf310f426d09ba76fce72648d0a46aeaeaddefbf1 (diff)
Doc: Fix cmake example snippets
The argument to file(GENERATE...) is called CONTENT, not CONTENTS. Pick-to: 6.3 Change-Id: I22fb9eb966223e034b2606cf24315d3cf6a03df1 Reviewed-by: Alexandru Croitor <[email protected]>
-rw-r--r--src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc2
-rw-r--r--src/corelib/doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc b/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc
index 38119d498cd..2480c4e6a23 100644
--- a/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc
+++ b/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc
@@ -85,7 +85,7 @@ customized deployment logic may find it useful.
# The following script must only be executed at install time
set(deploy_script "${CMAKE_CURRENT_BINARY_DIR}/deploy_custom.cmake")
-file(GENERATE OUTPUT ${deploy_script} CONTENTS "
+file(GENERATE OUTPUT ${deploy_script} CONTENT "
include(\"${QT_DEPLOY_SUPPORT}\")
qt_deploy_qt_conf(\"\${QT_DEPLOY_BIN_DIR}/qt.conf\")
")
diff --git a/src/corelib/doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc b/src/corelib/doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc
index 6faf1a3cdfc..291bfcfe5c2 100644
--- a/src/corelib/doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc
+++ b/src/corelib/doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc
@@ -10,7 +10,7 @@ qt_add_executable(MyApp main.cpp)
# The following script must only be executed at install time
set(deploy_script "${CMAKE_CURRENT_BINARY_DIR}/deploy_MyApp.cmake")
-file(GENERATE OUTPUT ${deploy_script} CONTENTS "
+file(GENERATE OUTPUT ${deploy_script} CONTENT "
include(\"${QT_DEPLOY_SUPPORT}\")
qt_deploy_runtime_dependencies(
EXECUTABLE \"\${QT_DEPLOY_BIN_DIR}/$<TARGET_FILE_NAME:MyApp>\"