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>

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);

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);

qmake/generators/unix/unixmake2.cpp

@@ -1428,7 +1428,7 @@ UnixMakefileGenerator::libtoolFileName()
     QString 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()
     QString 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('.');