diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-26 09:45:43 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-26 09:49:16 (GMT) |
| commit | 821a9e8a4dd7636db59767d5fa73da3823dcdf1e (patch) | |
| tree | 6e0e03fa49b37e6d4088871ebd7a04e52a64de24 /qmake | |
| parent | a373648fa876a9684394aa9b7ecafd51e53f4742 (diff) | |
| download | Qt-821a9e8a4dd7636db59767d5fa73da3823dcdf1e.zip Qt-821a9e8a4dd7636db59767d5fa73da3823dcdf1e.tar.gz Qt-821a9e8a4dd7636db59767d5fa73da3823dcdf1e.tar.bz2 | |
fix generated makefile dependencies
seems like some makes are rather lax about bogus dependencies, so this
went unnoticed in local testing for at least two people.
Diffstat (limited to 'qmake')
| -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'", |