diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-23 11:31:48 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-12 09:58:37 (GMT) |
commit | 3838388e8143ac5f5e1f3688f9ba31190fd9bbd3 (patch) | |
tree | 5be42ece1ad50ce480a7a84b16811f85aca46566 /qmake/generators/makefile.cpp | |
parent | c4dd5b7eb3b8a212d2f80bbca2a2713a57cf1247 (diff) | |
download | Qt-3838388e8143ac5f5e1f3688f9ba31190fd9bbd3.zip Qt-3838388e8143ac5f5e1f3688f9ba31190fd9bbd3.tar.gz Qt-3838388e8143ac5f5e1f3688f9ba31190fd9bbd3.tar.bz2 |
useful location reporting for errors from QMAKE_SUBSTITUTES
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index c13f38e..f9eba22 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -545,7 +545,7 @@ MakefileGenerator::init() else state.pop(); } else if(state.isEmpty() || state.top() == IN_CONDITION) { - contents += project->expand(line).join(QString(Option::field_sep)); + contents += project->expand(line, in.fileName(), count); } } if(out.exists() && out.open(QFile::ReadOnly)) { |