Commit c1b92fea authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

QMakePM: Try to set current node even if rename fails

It always fails if the file is included by $$files(*), but the new
filename is expected to appear nevertheless.

Change-Id: I4ae102372685013182b4471b996610e68cb7f751
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 884922d3
......@@ -1107,6 +1107,8 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
if (newFilePath.isEmpty())
return false;
m_setCurrentNodeDelayed = newFilePath;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
const Core::MimeType mt = Core::MimeDatabase::findByFile(newFilePath);
QStringList dummy;
......@@ -1117,7 +1119,6 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
changeFiles(mt.type(), QStringList() << newFilePath, &dummy, AddToProFile);
if (!dummy.isEmpty() && !changeProFileOptional)
return false;
m_setCurrentNodeDelayed = newFilePath;
return true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment