diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-09-01 05:00:54 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-09-01 05:00:54 (GMT) |
| commit | 036d7afd42ce3ca9736e173a72bc5228a1eb211d (patch) | |
| tree | bbeefb4384b393e860350a8a6142fa7d27141644 /qmake/generators/makefile.cpp | |
| parent | 87bc302810b97bd647187e5e31f5276ae729dce0 (diff) | |
| parent | 31e4efaf2178b81552e875eb5a1d5a894310e561 (diff) | |
| download | Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.zip Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.tar.gz Qt-036d7afd42ce3ca9736e173a72bc5228a1eb211d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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 03732ba..c7b1473 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -551,7 +551,7 @@ MakefileGenerator::init() if(out.exists() && out.open(QFile::ReadOnly)) { QString old = QString::fromUtf8(out.readAll()); if(contents == old) { - v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i)); + v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName()); continue; } out.close(); @@ -563,7 +563,7 @@ MakefileGenerator::init() } mkdir(QFileInfo(out).absolutePath()); if(out.open(QFile::WriteOnly)) { - v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i)); + v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName()); out.write(contents.toUtf8()); } else { warn_msg(WarnLogic, "Cannot open substitute for output '%s'", |