summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-06-02 16:00:07 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-06-12 17:14:34 +0200
commit2ad3147542a45436733ddd7014993bcc3022a654 (patch)
tree2d1fb6cb8c099ba3da3ebb622143148b20e6d903
parentca3e082b3567e5aa21b4c3fb221824642d98ee89 (diff)
downloadqt-creator-2ad3147542a45436733ddd7014993bcc3022a654.tar.gz
QmakeNodes::addNewInformation: Be responsible subfolder nodes
And increase the priority for those too. Fixes the case: a.pro b.pri test c.pri Right click on test and add new file. In that case b.pri should be the node to which the file is added. Task-number: QTCREATORBUG-12272 Change-Id: I54d144861bc06545db8e71ed33513a0df971dae2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r--src/plugins/qmakeprojectmanager/qmakenodes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 58762fbb7f..b0f7044190 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -1069,7 +1069,7 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil
ProjectExplorer::FolderNode::AddNewInformation QmakePriFileNode::addNewInformation(const QStringList &files, Node *context) const
{
Q_UNUSED(files)
- return ProjectExplorer::FolderNode::AddNewInformation(QFileInfo(path()).fileName(), context == this ? 120 : 90);
+ return ProjectExplorer::FolderNode::AddNewInformation(QFileInfo(path()).fileName(), context->projectNode() == this ? 120 : 90);
}
bool QmakePriFileNode::priFileWritable(const QString &path)
@@ -1576,7 +1576,7 @@ bool QmakeProFileNode::showInSimpleTree() const
ProjectExplorer::FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files, Node *context) const
{
Q_UNUSED(files)
- return AddNewInformation(QFileInfo(path()).fileName(), context == this ? 120 : 100);
+ return AddNewInformation(QFileInfo(path()).fileName(), context->projectNode() == this ? 120 : 100);
}
bool QmakeProFileNode::showInSimpleTree(QmakeProjectType projectType) const