summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoão Abecasis <joao@abecasis.name>2009-04-02 13:47:54 (GMT)
committerJoão Abecasis <joao@abecasis.name>2009-04-02 14:29:49 (GMT)
commit0d026b267badbf7890b02256826f0ff3821fcec7 (patch)
tree4f0cc8d6371f08f113beee5f4002dad214fc5a6c /qmake/generators
parentd9e3fd083217f3b03f211d64e7d78b36da90bf51 (diff)
downloadQt-0d026b267badbf7890b02256826f0ff3821fcec7.zip
Qt-0d026b267badbf7890b02256826f0ff3821fcec7.tar.gz
Qt-0d026b267badbf7890b02256826f0ff3821fcec7.tar.bz2
Spring cleaning in qmake tests
And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/makefile.h6
-rw-r--r--qmake/generators/metamakefile.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index a26a247..cf09a6a 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -109,7 +109,7 @@ protected:
struct SubTarget
{
QString name;
- QString in_directory, out_directory;
+ QString in_directory, out_directory;
QString profile, target, makefile;
QStringList depends;
};
@@ -183,8 +183,8 @@ protected:
void filterIncludedFiles(const QString &);
virtual void processSources() {
- filterIncludedFiles("SOURCES");
- filterIncludedFiles("GENERATED_SOURCES");
+ filterIncludedFiles("SOURCES");
+ filterIncludedFiles("GENERATED_SOURCES");
}
//for cross-platform dependent directories
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index f0683a7..3f60791 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -360,7 +360,7 @@ SubdirsMetaMakefileGenerator::init()
}
--recurseDepth;
- Option::output.setFileName(old_output);
+ Option::output.setFileName(old_output);
Option::output_dir = old_output_dir;
qmake_setpwd(oldpwd);
}