tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in
2index 93f47570706..b00d398d671 100644
3--- a/cmake/QtConfig.cmake.in
4+++ b/cmake/QtConfig.cmake.in
5@@ -190,7 +190,6 @@ foreach(module ${__qt_umbrella_find_components})
6 ${_qt_additional_packages_prefix_paths}
7 ${__qt_find_package_host_qt_path}
8 ${_qt_additional_host_packages_prefix_paths}
9- ${__qt_use_no_default_path_for_qt_packages}
10 )
11 endif()
12
13diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake
14index c43824b8234..7ef65eb0f36 100644
15--- a/cmake/QtFindWrapHelper.cmake
16+++ b/cmake/QtFindWrapHelper.cmake
17@@ -79,7 +79,6 @@ macro(qt_find_package_system_or_bundled _unique_prefix)
18 "${CMAKE_CURRENT_LIST_DIR}/.."
19 ${_qt_cmake_dir}
20 ${_qt_additional_packages_prefix_paths}
21- ${${_unique_prefix}_qt_use_no_default_path_for_qt_packages}
22 )
23 else()
24 # For the non-bundled case we will look for FindWrapSystemFoo.cmake module files,
25diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in
26index e3af0299c57..2bbc06ddec3 100644
27--- a/cmake/QtModuleConfig.cmake.in
28+++ b/cmake/QtModuleConfig.cmake.in
29@@ -59,7 +59,6 @@ if (@INSTALL_CMAKE_NAMESPACE@@target@_FOUND
30 "${CMAKE_CURRENT_LIST_DIR}/.."
31 "${_qt_cmake_dir}"
32 ${_qt_additional_packages_prefix_paths}
33- ${__qt_use_no_default_path_for_qt_packages}
34 )
35
36 if(NOT @INSTALL_CMAKE_NAMESPACE@@target_private@_FOUND)
37diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
38index 78ada0a7425..74659943a83 100644
39--- a/cmake/QtModuleDependencies.cmake.in
40+++ b/cmake/QtModuleDependencies.cmake.in
41@@ -23,7 +23,6 @@ if(NOT @INSTALL_CMAKE_NAMESPACE@_FOUND)
42 "${CMAKE_CURRENT_LIST_DIR}/.."
43 "${_qt_cmake_dir}"
44 ${_qt_additional_packages_prefix_paths}
45- ${__qt_use_no_default_path_for_qt_packages}
46 )
47 endif()
48
49diff --git a/cmake/QtPublicDependencyHelpers.cmake b/cmake/QtPublicDependencyHelpers.cmake
50index b4a0342ad87..a7de8750485 100644
51--- a/cmake/QtPublicDependencyHelpers.cmake
52+++ b/cmake/QtPublicDependencyHelpers.cmake
53@@ -144,7 +144,6 @@ macro(_qt_internal_find_qt_dependencies target target_dep_list find_dependency_p
54 ${QT_BUILD_CMAKE_PREFIX_PATH}
55 ${${find_dependency_path_list}}
56 ${_qt_additional_packages_prefix_paths}
57- ${__qt_use_no_default_path_for_qt_packages}
58 )
59 if(NOT ${__qt_${target}_pkg}_FOUND)
60 list(APPEND __qt_${target}_missing_deps "${__qt_${target}_pkg}")