diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-05 13:31:35 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-08 16:49:13 +0000 |
| commit | ecffba2fa94e16ff05732a8cca54e436a48f8dd3 (patch) | |
| tree | 41f571a52f658a85dadb379e5f43209ad8794abc /bin | |
| parent | 8e0ba3ca017667bdeb6c1a64ca3b8223f21c1cda (diff) | |
Provide a qtpaths wrapper script when cross-building Qt
The qtpaths tool is supposed to replace "qmake -query", and it must be
available for cross-builds as a wrapper script like qmake.
Re-use the existing facility for creating the qmake wrapper script for
creating the qtpaths wrapper script.
Fixes: QTBUG-97821
Change-Id: I460bae61a531994422e1c0fba09c79e4aa65713f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 71e490f0baee0d27a45a17886c48f5defbbaea42)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/qmake-and-qtpaths-wrapper.bat.in | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/qmake-and-qtpaths-wrapper.in (renamed from bin/qmake-wrapper-for-target.in) | 2 | ||||
| -rw-r--r-- | bin/qmake-wrapper-for-target.bat.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/qmake-and-qtpaths-wrapper.bat.in b/bin/qmake-and-qtpaths-wrapper.bat.in new file mode 100644 index 0000000000..8225170fc9 --- /dev/null +++ b/bin/qmake-and-qtpaths-wrapper.bat.in @@ -0,0 +1,2 @@ +@echo off +@host_qt_bindir@\@tool_name@.exe -qtconf "%~dp0\target_qt.conf" %* diff --git a/bin/qmake-wrapper-for-target.in b/bin/qmake-and-qtpaths-wrapper.in index 265ce760de..f26355af8d 100644..100755 --- a/bin/qmake-wrapper-for-target.in +++ b/bin/qmake-and-qtpaths-wrapper.in @@ -4,4 +4,4 @@ script_dir_path=`dirname $0` script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` -@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $* +@host_qt_bindir@/@tool_name@ -qtconf "$script_dir_path/target_qt.conf" $* diff --git a/bin/qmake-wrapper-for-target.bat.in b/bin/qmake-wrapper-for-target.bat.in deleted file mode 100644 index 8df27eaa44..0000000000 --- a/bin/qmake-wrapper-for-target.bat.in +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -@host_qt_bindir@\qmake.exe -qtconf "%~dp0\target_qt.conf" %* |