summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix/unixmake2.cpp
diff options
context:
space:
mode:
authorOBATA Akio <[email protected]>2020-07-23 17:53:20 +0900
committerOBATA Akio <[email protected]>2020-07-23 17:53:20 +0900
commit5c270c3e26e74609a1821ddd3bb17566ccc53396 (patch)
tree96bbcf5733d6c4e795a2ba1e7f634a32eacb3965 /qmake/generators/unix/unixmake2.cpp
parenta31f05cb8e90781228e9d6a60ef97cc1bca83345 (diff)
downloadtqt3-5c270c3e26e74609a1821ddd3bb17566ccc53396.tar.gz
tqt3-5c270c3e26e74609a1821ddd3bb17566ccc53396.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]>
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
-rw-r--r--qmake/generators/unix/unixmake2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 8ea7e367b..56e3b8de8 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1428,7 +1428,7 @@ UnixMakefileGenerator::libtoolFileName()
TQString ret = var("TARGET");
int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1)
- ret = ret.right(ret.length() - slsh);
+ ret = ret.right(ret.length() - slsh - 1);
int dot = ret.find('.');
if(dot != -1)
ret = ret.left(dot);
@@ -1512,7 +1512,7 @@ UnixMakefileGenerator::pkgConfigFileName()
TQString ret = var("TARGET");
int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1)
- ret = ret.right(ret.length() - slsh);
+ ret = ret.right(ret.length() - slsh - 1);
if(ret.startsWith("lib"))
ret = ret.mid(3);
int dot = ret.find('.');