Remove commented out code.
Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e) Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e
This commit is contained in:
parent
096f93341a
commit
a69446d4e9
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user