From da05f3dafd04305c7b1354ef42f1643ee74100a9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 5 Apr 2013 13:01:09 +0100 Subject: [PATCH] Android: Split Unix Makefile generator's $(MOVE) commands up Split $(MOVE) commands up into one per file so that cmd.exe's builtin move command can be used. Change-Id: Ife8d7449a2d7718a67082e2d78954964033ce07d Reviewed-by: Oswald Buddenhagen --- qmake/generators/unix/unixmake2.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 400908bc912..9cb63ce5399 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -579,7 +579,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) << "-$(DEL_FILE) " << destdir << "$(TARGET0)\n\t" << "-$(DEL_FILE) " << destdir << "$(TARGET1)\n\t" << "-$(DEL_FILE) " << destdir << "$(TARGET2)\n\t" - << "-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) " << destdir; + << "-$(MOVE) $(TARGET) " << destdir << "\n\t" + << "-$(MOVE) $(TARGET0) " << destdir << "\n\t" + << "-$(MOVE) $(TARGET1) " << destdir << "\n\t" + << "-$(MOVE) $(TARGET2) " << destdir << "\n\t"; if(!project->isEmpty("QMAKE_POST_LINK")) t << "\n\t" << var("QMAKE_POST_LINK"); t << endl << endl; @@ -592,7 +595,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "\n\t" << "-$(DEL_FILE) " << destdir << "$(TARGET)\n\t" << "-$(DEL_FILE) " << destdir << "$(TARGET0)\n\t" - << "-$(MOVE) $(TARGET) $(TARGET0) " << destdir; + << "-$(MOVE) $(TARGET) " << destdir << "\n\t" + << "-$(MOVE) $(TARGET0) " << destdir << "\n\t"; if(!project->isEmpty("QMAKE_POST_LINK")) t << "\n\t" << var("QMAKE_POST_LINK"); t << endl << endl;