fix file separators in 'clean' targets
Task-number: QTBUG-39690 Change-Id: Ibbed847258a3a7e21d6d10b9400af0001d10c6f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
parent
a19f1d320a
commit
4c3fdc01c4
@ -537,12 +537,13 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
|
|||||||
const QString del_statement("-$(DEL_FILE)");
|
const QString del_statement("-$(DEL_FILE)");
|
||||||
if(project->isActiveConfig("no_delete_multiple_files")) {
|
if(project->isActiveConfig("no_delete_multiple_files")) {
|
||||||
for (ProStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
|
for (ProStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
|
||||||
t << "\n\t" << del_statement << " " << escapeFilePath((*it));
|
t << "\n\t" << del_statement
|
||||||
|
<< ' ' << escapeFilePath(Option::fixPathToTargetOS((*it).toQString()));
|
||||||
} else {
|
} else {
|
||||||
QString files, file;
|
QString files, file;
|
||||||
const int commandlineLimit = 2047; // NT limit, expanded
|
const int commandlineLimit = 2047; // NT limit, expanded
|
||||||
for (ProStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
|
for (ProStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
|
||||||
file = " " + escapeFilePath((*it));
|
file = ' ' + escapeFilePath(Option::fixPathToTargetOS((*it).toQString()));
|
||||||
if(del_statement.length() + files.length() +
|
if(del_statement.length() + files.length() +
|
||||||
qMax(fixEnvVariables(file).length(), file.length()) > commandlineLimit) {
|
qMax(fixEnvVariables(file).length(), file.length()) > commandlineLimit) {
|
||||||
t << "\n\t" << del_statement << files;
|
t << "\n\t" << del_statement << files;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user