TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix to detect file conponent from path properly in Makefile generator

Browse Source 
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 30a7754971)
v3.5.13-sru
OBATA Akio 4 years ago committed by Slávek Banko
parent 56ca1e3a95
commit ae3d63aa83
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
qmake/generators/makefile.cpp
Unescape View File

@ -1183,7 +1183,7 @@ MakefileGenerator::init()
Option::fixPathToTargetOS(imgfile); Option::fixPathToTargetOS(imgfile);
if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
if(imgfile.find(Option::dir_sep) != -1) 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") : imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") :
project->first("UI_DIR")) ); project->first("UI_DIR")) );
v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile); v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile);
@ -1433,7 +1433,7 @@ MakefileGenerator::write()
QString prl = var("TARGET"); QString prl = var("TARGET");
int slsh = prl.findRev(Option::dir_sep); int slsh = prl.findRev(Option::dir_sep);
if(slsh != -1) if(slsh != -1)
prl = prl.right(prl.length() - slsh); prl = prl.right(prl.length() - slsh - 1);
int dot = prl.find('.'); int dot = prl.find('.');
if(dot != -1) if(dot != -1)
prl = prl.left(dot); prl = prl.left(dot);

4
qmake/generators/unix/unixmake.cpp
Unescape View File

@ -763,7 +763,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
QString src_lt = var("QMAKE_ORIG_TARGET"); QString src_lt = var("QMAKE_ORIG_TARGET");
int slsh = src_lt.findRev(Option::dir_sep); int slsh = src_lt.findRev(Option::dir_sep);
if(slsh != -1) 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('.'); int dot = src_lt.find('.');
if(dot != -1) if(dot != -1)
src_lt = src_lt.left(dot); src_lt = src_lt.left(dot);
@ -786,7 +786,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
QString src_pc = var("QMAKE_ORIG_TARGET"); QString src_pc = var("QMAKE_ORIG_TARGET");
int slsh = src_pc.findRev(Option::dir_sep); int slsh = src_pc.findRev(Option::dir_sep);
if(slsh != -1) 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('.'); int dot = src_pc.find('.');
if(dot != -1) if(dot != -1)
src_pc = src_pc.left(dot); src_pc = src_pc.left(dot);

4
qmake/generators/unix/unixmake2.cpp
Unescape View File

@ -1428,7 +1428,7 @@ UnixMakefileGenerator::libtoolFileName()
QString ret = var("TARGET"); QString ret = var("TARGET");
int slsh = ret.findRev(Option::dir_sep); int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1) if(slsh != -1)
ret = ret.right(ret.length() - slsh); ret = ret.right(ret.length() - slsh - 1);
int dot = ret.find('.'); int dot = ret.find('.');
if(dot != -1) if(dot != -1)
ret = ret.left(dot); ret = ret.left(dot);
@ -1512,7 +1512,7 @@ UnixMakefileGenerator::pkgConfigFileName()
QString ret = var("TARGET"); QString ret = var("TARGET");
int slsh = ret.findRev(Option::dir_sep); int slsh = ret.findRev(Option::dir_sep);
if(slsh != -1) if(slsh != -1)
ret = ret.right(ret.length() - slsh); ret = ret.right(ret.length() - slsh - 1);
if(ret.startsWith("lib")) if(ret.startsWith("lib"))
ret = ret.mid(3); ret = ret.mid(3);
int dot = ret.find('.'); int dot = ret.find('.');

Write Preview
Loading…
Cancel
Save