diff options
| author | OBATA Akio <[email protected]> | 2020-07-23 17:53:20 +0900 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-02-02 01:41:09 +0100 |
| commit | ccb28f09f42d22eea45ed25f791cdc8c71d751f5 (patch) | |
| tree | 012a2447b549dca44eac9564b190fa0b9c53f9ab /qmake/generators/unix/unixmake.cpp | |
| parent | 9f643e09538a6d0f5e260fe7d58bd5d4dc542613 (diff) | |
| download | qt3-ccb28f09f42d22eea45ed25f791cdc8c71d751f5.tar.gz qt3-ccb28f09f42d22eea45ed25f791cdc8c71d751f5.zip | |
Fix to detect file conponent from path properly in Makefile generator
It should be either `path.right(path.length() - sep_pos - 1)` or
`path.mid(sep_pos + 1)`.
Signed-off-by: OBATA Akio <[email protected]>
(cherry picked from commit 30a7754971fee794819df164dd1601b2af49587a)
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 865c84a..34cefaa 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -763,7 +763,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) QString src_lt = var("QMAKE_ORIG_TARGET"); int slsh = src_lt.findRev(Option::dir_sep); if(slsh != -1) - src_lt = src_lt.right(src_lt.length() - slsh); + src_lt = src_lt.right(src_lt.length() - slsh - 1); int dot = src_lt.find('.'); if(dot != -1) src_lt = src_lt.left(dot); @@ -786,7 +786,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) QString src_pc = var("QMAKE_ORIG_TARGET"); int slsh = src_pc.findRev(Option::dir_sep); if(slsh != -1) - src_pc = src_pc.right(src_pc.length() - slsh); + src_pc = src_pc.right(src_pc.length() - slsh - 1); int dot = src_pc.find('.'); if(dot != -1) src_pc = src_pc.left(dot); |