diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-09-23 13:05:00 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-09-23 15:46:37 +0200 |
| commit | 06615843df1541e67686f6a016f0c81e154c1869 (patch) | |
| tree | bd3acb89e1fc9b78afeefde9be54c9f25b452798 /src/plugins/projectexplorer/projectnodes.h | |
| parent | 917aa1064ee2a80cc9e869196c444d05debba73d (diff) | |
| download | qt-creator-06615843df1541e67686f6a016f0c81e154c1869.tar.gz | |
Qbs: Do not crash when using simplified project view
Root cause is trying to set the display name on a FolderNode that
is not in the tree yet.
Allow setting the displayname in the constructor and use that new
constructor where it makes sense.
Task-number: QTCREATORBUG-12897
Change-Id: I907e48cac837966e38524bfe88a87ef17d93f0b2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectnodes.h')
| -rw-r--r-- | src/plugins/projectexplorer/projectnodes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 8212e7134a..233f93069b 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -162,7 +162,8 @@ private: class PROJECTEXPLORER_EXPORT FolderNode : public Node { Q_OBJECT public: - explicit FolderNode(const QString &folderPath, NodeType nodeType = FolderNodeType); + explicit FolderNode(const QString &folderPath, NodeType nodeType = FolderNodeType, + const QString &displayName = QString()); virtual ~FolderNode(); QString displayName() const; |