diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
| commit | 2786250c172138c1ece456305264f7b5039b8f2a (patch) | |
| tree | dd0a56d98aefe9e1c6a3042b5cbcc37e87bd903b /src/plugins/resourceeditor/resourcenode.cpp | |
| parent | e9d433a99a8fa4769df92f9caaaaaec049596c34 (diff) | |
| parent | 27cc89eb4a1e157c68793718602416448547de20 (diff) | |
| download | qt-creator-2786250c172138c1ece456305264f7b5039b8f2a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
Diffstat (limited to 'src/plugins/resourceeditor/resourcenode.cpp')
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 1820c20a61..e27915a665 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -266,7 +266,7 @@ ProjectExplorer::FolderNode::AddNewInformation ResourceTopLevelNode::addNewInfor // two nodes would be responsible for '/' // Thus also return a high priority for it if (ResourceFolderNode *rfn = qobject_cast<ResourceFolderNode *>(context)) - if (rfn->prefix() == QLatin1String("/")) + if (rfn->prefix() == QLatin1String("/") && rfn->parentFolderNode() == this) p = 150; } |