diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-10-12 18:38:09 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-10-12 18:38:24 (GMT) |
| commit | c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e (patch) | |
| tree | 501438acd0aa4bbd0f6c3af14a981cb77db5b5c1 | |
| parent | f44cb8910d8fe421d0b1f685525b27a08f47e78d (diff) | |
| download | Qt-c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e.zip Qt-c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e.tar.gz Qt-c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e.tar.bz2 | |
Remove commented out code.
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index f273237..aaf243d 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; |