AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually use the temp variable we just assigned ...

Browse Source 
Change-Id: I535a4bfc268a07d6b1813e47cdae862e5e459efc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-02-25 15:13:51 +01:00 committed by The Qt Project
parent 64d03e1c34
commit dd06f991af
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/metamakefile.cpp
View File

@ -385,16 +385,16 @@ SubdirsMetaMakefileGenerator::write()
const QString &output_name = Option::output.fileName(); const QString &output_name = Option::output.fileName();
for(int i = 0; ret && i < subs.count(); i++) { for(int i = 0; ret && i < subs.count(); i++) {
const Subdir *sub = subs.at(i); const Subdir *sub = subs.at(i);
qmake_setpwd(subs.at(i)->input_dir); qmake_setpwd(sub->input_dir);
Option::output_dir = QFileInfo(subs.at(i)->output_dir).absoluteFilePath(); Option::output_dir = QFileInfo(sub->output_dir).absoluteFilePath();
Option::output.setFileName(subs.at(i)->output_file); Option::output.setFileName(sub->output_file);
if(i != subs.count()-1) { if(i != subs.count()-1) {
for (int ind = 0; ind < sub->indent; ++ind) for (int ind = 0; ind < sub->indent; ++ind)
printf(" "); printf(" ");
printf("Writing %s\n", QDir::cleanPath(Option::output_dir+"/"+ printf("Writing %s\n", QDir::cleanPath(Option::output_dir+"/"+
Option::output.fileName()).toLatin1().constData()); Option::output.fileName()).toLatin1().constData());
} }
if (!(ret = subs.at(i)->makefile->write())) if (!(ret = sub->makefile->write()))
break; break;
//restore because I'm paranoid //restore because I'm paranoid
qmake_setpwd(pwd); qmake_setpwd(pwd);