feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakePM: Try to set current node even if rename fails

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

Change-Id: I4ae102372685013182b4471b996610e68cb7f751
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2014-11-05 22:42:05 +02:00
committed by Orgad Shaneh
parent 884922d3ef
commit c1b92fea69
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1107,6 +1107,8 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
if (newFilePath.isEmpty()) if (newFilePath.isEmpty())
return false; return false;
m_setCurrentNodeDelayed = newFilePath;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath()); bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
const Core::MimeType mt = Core::MimeDatabase::findByFile(newFilePath); const Core::MimeType mt = Core::MimeDatabase::findByFile(newFilePath);
QStringList dummy; QStringList dummy;
@@ -1117,7 +1119,6 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
changeFiles(mt.type(), QStringList() << newFilePath, &dummy, AddToProFile); changeFiles(mt.type(), QStringList() << newFilePath, &dummy, AddToProFile);
if (!dummy.isEmpty() && !changeProFileOptional) if (!dummy.isEmpty() && !changeProFileOptional)
return false; return false;
m_setCurrentNodeDelayed = newFilePath;
return true; return true;
} }