aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-11-08 12:31:44 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-11-08 15:20:26 +0100
commitcc7afebe0c913a3ba31364e5f820f69894d3aa85 (patch)
tree811fb7f96800a7c0dcc43d9204681e705dcc1e7e /build_scripts
parent1a8db65a6efc8d8d2404f11c7b66baf7bf722ddb (diff)
Build system: Check for qtpaths6 only
When building against a system Qt version on Linux, searching for qtpaths first might find a Qt 5 version, causing a misleading error message. Searching for both cannot work since which() throws on failure. Change-Id: Ifec2e880cec79c9b0ce978808051e2d4dae8b0d2 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/options.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py
index 449597633..2f52ec882 100644
--- a/build_scripts/options.py
+++ b/build_scripts/options.py
@@ -452,8 +452,6 @@ class CommandMixin(object):
def _find_qtpaths_in_path(self):
if not self.qtpaths:
- self.qtpaths = Path(which("qtpaths"))
- if not self.qtpaths:
self.qtpaths = Path(which("qtpaths6"))
def _determine_defaults_and_check(self):