From 3cd8099cfc902b4e9359cd63312e64994d76ad69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 16 Feb 2022 11:59:06 +0100 Subject: [PATCH] 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 --- src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc | 2 +- .../doc/src/includes/cmake-deploy-runtime-dependencies.qdocinc | 2 +- 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 38119d498c..2480c4e6a2 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 6faf1a3cdf..291bfcfe5c 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}/$\"