summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorRolland Dudemaine <rolland@ghs.com>2011-10-12 20:38:09 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-18 20:25:53 +0100
commita69446d4e9562ec04541efd50ff6832686b0906d (patch)
tree18ccd8866919e7cbbfac5a42449e2536df4ea2d7 /qmake/generators
parent096f93341a53c349af7223292414ffd2c8e0fa24 (diff)
Remove commented out code.
Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e) Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/integrity/gbuild.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
index f273237958..aaf243dc76 100644
--- a/qmake/generators/integrity/gbuild.cpp
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -392,19 +392,12 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove
s += "\n";
} else if (filename.endsWith(Option::cpp_ext.first())) {
QString tmpstr(filename.section("/", -1));
-// QString moctool(project->values("QMAKE_MOC").first());
QString filepath(pathtoremove);
if (!project->values("QT_SOURCE_TREE").isEmpty()) {
filepath.remove(project->values("QT_SOURCE_TREE").first());
filepath.remove(0, 1);
}
-// if (!project->values("QT_BUILD_TREE").isEmpty()) {
-// moctool.remove(project->values("QT_BUILD_TREE").first());
-// moctool.remove(0, 1);
-// }
s += "\n\t:preexecShellSafe='${QT_BUILD_DIR}/bin/moc ";
-// s += moctool;
-// s += " ";
s += varGlue("DEFINES", "-D", " -D", " ");
s += varGlue("INCLUDEPATH", "-I", " -I", " ");
s += filepath;