From fd91d1a66824497043e38ada350cdfcbfee3e300 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 8 Jun 2023 14:46:44 +0200 Subject: [PATCH] Move QT_ALLOW_SYMLINK_IN_PATHS warning to config.summary I think this needs to be more prominent, as I noticed during the testing that it could cause issues if it gets lost in between the config messages, as we knew of course. Task-number: QTBUG-113463 Change-Id: I2ece498a8d3604362a49cc10499b92b0d2764fb9 Reviewed-by: Alexandru Croitor (cherry picked from commit 9a5de496f1ff37b345010dd70304b2408f273322) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 6 ------ configure.cmake | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index e4876332106..14dc4c6955a 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1442,12 +1442,6 @@ function(qt_internal_get_filename_path_mode out_var) set(mode REALPATH) if(APPLE AND QT_ALLOW_SYMLINK_IN_PATHS) set(mode ABSOLUTE) - message(WARNING - "QT_ALLOW_SYMLINK_IN_PATHS is enabled. " - "This is not recommended, and it may lead to unexpected issues. " - "E.g., When building QtWebEngine, enabling this option may result in build " - "issues in certain platforms. See https://bugreports.qt.io/browse/QTBUG-59769." - ) endif() set(${out_var} ${mode} PARENT_SCOPE) endfunction() diff --git a/configure.cmake b/configure.cmake index 7978bcc1e37..d334a9bbdd1 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1245,3 +1245,11 @@ qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC) qt_extra_definition("QT_COPYRIGHT" \"${QT_COPYRIGHT}\" PRIVATE) qt_extra_definition("QT_COPYRIGHT_YEAR" \"${QT_COPYRIGHT_YEAR}\" PRIVATE) + +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "QT_ALLOW_SYMLINK_IN_PATHS is enabled. This is not recommended, and it may lead to unexpected issues. +E.g., When building QtWebEngine, enabling this option may result in build issues in certain platforms. +See https://bugreports.qt.io/browse/QTBUG-59769." + CONDITION QT_ALLOW_SYMLINK_IN_PATHS +)