summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-22 10:54:23 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-23 09:05:35 (GMT)
commit5c787e03ef321f4dd2eda8e229978639ccfb70cc (patch)
tree755e50f9001b6254ab1beffba6f646d4eb013b95 /qmake/project.cpp
parent4325512a4459003c25db981e185412c81410754a (diff)
downloadQt-5c787e03ef321f4dd2eda8e229978639ccfb70cc.zip
Qt-5c787e03ef321f4dd2eda8e229978639ccfb70cc.tar.gz
Qt-5c787e03ef321f4dd2eda8e229978639ccfb70cc.tar.bz2
don't remove the path from the name of included files
it is not done for the top-level file, either. this is minimally behavior-incompatible, but anyone relying on the old behavior (and thus not using $$basename()) should be shot anyway. :) Reviewed-by: joerg
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 76cca00..cb02923 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1710,7 +1710,6 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL
fprintf(stderr, "Cannot find directory: %s\n", file.left(di).toLatin1().constData());
return IncludeFailure;
}
- file = file.right(file.length() - di - 1);
}
bool parsed = false;
parser_info pi = parser;