diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-07-23 17:53:20 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-02 01:41:09 +0100 |
| commit | ccb28f09f42d22eea45ed25f791cdc8c71d751f5 (patch) | |
| tree | 012a2447b549dca44eac9564b190fa0b9c53f9ab /qmake/generators/makefile.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 <obache@wizdas.com>
(cherry picked from commit 30a7754971fee794819df164dd1601b2af49587a)
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e9b652a..7f25444 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1183,7 +1183,7 @@ MakefileGenerator::init() Option::fixPathToTargetOS(imgfile); if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { if(imgfile.find(Option::dir_sep) != -1) - imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1); + imgfile = imgfile.mid(imgfile.findRev(Option::dir_sep) + 1); imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") : project->first("UI_DIR")) ); v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile); @@ -1433,7 +1433,7 @@ MakefileGenerator::write() QString prl = var("TARGET"); int slsh = prl.findRev(Option::dir_sep); if(slsh != -1) - prl = prl.right(prl.length() - slsh); + prl = prl.right(prl.length() - slsh - 1); int dot = prl.find('.'); if(dot != -1) prl = prl.left(dot); |