From 4ed0a29d338d99971be9eaa9b41db41e02452c15 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Thu, 23 Jul 2020 17:53:20 +0900 Subject: 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 (cherry picked from commit 5c270c3e26e74609a1821ddd3bb17566ccc53396) --- qmake/generators/unix/unixmake.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake/generators/unix/unixmake.cpp') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index d796e4d7b..2cb2ec9d4 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -763,7 +763,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) TQString 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 TQString &t) TQString 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); -- cgit v1.2.3