summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-03-29 08:28:51 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-12 10:00:34 (GMT)
commit9df9d83085ff6164d83c35d51df539858ae398e4 (patch)
treea3a0d93b2381c7bc6e04a7406d9f00047ecace60 /qmake/generators
parentc74f29f28f2bfee8335820a67598d16e850e9444 (diff)
downloadQt-9df9d83085ff6164d83c35d51df539858ae398e4.zip
Qt-9df9d83085ff6164d83c35d51df539858ae398e4.tar.gz
Qt-9df9d83085ff6164d83c35d51df539858ae398e4.tar.bz2
fix paths of vpath-resolved files
Task-number: QTBUG-8169 Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/makefile.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 8159804..7eccc2e 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -364,7 +364,7 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v
dir = regex.left(regex.lastIndexOf(Option::dir_sep) + 1);
real_dir = dir;
if(!(flags & VPATH_NoFixify))
- real_dir = fileFixify(real_dir, qmake_getpwd(), Option::output_dir);
+ real_dir = fileFixify(real_dir, qmake_getpwd(), Option::output_dir) + '/';
regex.remove(0, dir.length());
}
if(real_dir.isEmpty() || exists(real_dir)) {
@@ -383,16 +383,15 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v
for(int i = (int)files.count()-1; i >= 0; i--) {
if(files[i] == "." || files[i] == "..")
continue;
- a = dir + files[i];
+ a = real_dir + files[i];
if(!(flags & VPATH_NoFixify))
a = fileFixify(a);
l.insert(val_it, a);
}
}
} else {
- debug_msg(1, "%s:%d Cannot match %s%c%s, as %s does not exist.",
+ debug_msg(1, "%s:%d Cannot match %s%s, as %s does not exist.",
__FILE__, __LINE__, real_dir.toLatin1().constData(),
- QDir::separator().toLatin1(),
regex.toLatin1().constData(), real_dir.toLatin1().constData());
if(flags & VPATH_RemoveMissingFiles)
remove_file = true;