From a69446d4e9562ec04541efd50ff6832686b0906d Mon Sep 17 00:00:00 2001 From: Rolland Dudemaine Date: Wed, 12 Oct 2011 20:38:09 +0200 Subject: Remove commented out code. Merge-request: 2693 Reviewed-by: Oswald Buddenhagen (cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e) Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e --- qmake/generators/integrity/gbuild.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'qmake') 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; -- cgit v1.2.3