diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2022-12-05 14:50:31 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2022-12-07 07:09:15 +0100 |
| commit | ca24ee14df2c47f748240c0bc4a2250c15c111da (patch) | |
| tree | f132ac6bdb301ddf8d81e4483698f76f4f433bc8 /bin | |
| parent | d8abcc969b976ecba987947208e3f59b192bc8ff (diff) | |
Create the versioned variant of Qt tools in cross platform build
In cross builds, we are not creating versioned links for qt tools. This
patch addresses that. I've changed the signature of the
`qt_internal_install_versioned_link` such that it can be used for
non-target as well, so in cross build the qmake or qtmake.bat can be
processed with the same function.
Fixes: QTBUG-109024
Change-Id: I246621c18325d084622ca92b422e815ed06f1381
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/qmake-and-qtpaths-wrapper.bat.in | 2 | ||||
| -rwxr-xr-x | bin/qmake-and-qtpaths-wrapper.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/qmake-and-qtpaths-wrapper.bat.in b/bin/qmake-and-qtpaths-wrapper.bat.in index 8225170fc9..5c952b0196 100644 --- a/bin/qmake-and-qtpaths-wrapper.bat.in +++ b/bin/qmake-and-qtpaths-wrapper.bat.in @@ -1,2 +1,2 @@ @echo off -@host_qt_bindir@\@tool_name@.exe -qtconf "%~dp0\target_qt.conf" %* +@host_qt_bindir@\@tool_name@@tool_version@.exe -qtconf "%~dp0\target_qt.conf" %* diff --git a/bin/qmake-and-qtpaths-wrapper.in b/bin/qmake-and-qtpaths-wrapper.in index f26355af8d..bf3d50cc22 100755 --- a/bin/qmake-and-qtpaths-wrapper.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@/@tool_name@ -qtconf "$script_dir_path/target_qt.conf" $* +@host_qt_bindir@/@tool_name@@tool_version@ -qtconf "$script_dir_path/target_qt.conf" $* |