diff options
| author | Alexandru Croitor <[email protected]> | 2025-12-01 19:00:32 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2025-12-02 07:26:01 +0100 |
| commit | aa6be092307e19dafb623a87df711d148f793fd1 (patch) | |
| tree | c86936c87ba381fdcd5aec83fbfcf690fa1c82dd /src | |
| parent | ed8e40653d2002ad56e91deed541409ddd2d5f03 (diff) | |
Silence missing deployment qtpaths warning on non-Windows platforms
In 36cee508a088e1570e1d89e060c3ccd14585d3f1 we started showing a
warning when a qtpaths executable or shell wrapper was not found in
the qt prefix.
This warning would appear on all platforms equally, even though in the
end the __QT_DEPLOY_TARGET_QT_PATHS_PATH variable is only used when
deploying a Windows app using windeployqt.
An example of when the warning appears is with a yocto SDK, where the
target qt prefix does not contain a qtpaths executable.
Make sure the warning is only shown when targeting the Windows
platform.
I considered searching for candidate qtpaths also in the host prefix
when available, but such a qtpaths most likely will not show
information for the target platform, and thus deploy the wrong
libraries.
Amends 36cee508a088e1570e1d89e060c3ccd14585d3f1
Pick-to: 6.8 6.10
Fixes: QTBUG-142336
Change-Id: If3df1f61cf1550b7271268c71a5826ed673a62fa
Reviewed-by: Joerg Bornemann <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 6f3a9fd05f5..b69d0285de2 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3264,7 +3264,7 @@ function(_qt_internal_setup_deploy_support) list(JOIN candidate_paths "\n " candidate_paths_joined) - if(NOT QT_NO_QTPATHS_DEPLOYMENT_WARNING AND NOT target_qtpaths_path) + if(WIN32 AND NOT QT_NO_QTPATHS_DEPLOYMENT_WARNING AND NOT target_qtpaths_path) message(WARNING "No qtpaths executable found for deployment purposes. Candidates searched: \n " "${candidate_paths_joined}" |