diff options
| author | Ville Nummela <ville.nummela@jolla.com> | 2019-06-18 14:39:38 +0300 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-06-25 11:53:58 +0000 |
| commit | 63e418024225f104c7bc51110ac2b12dec4d23ba (patch) | |
| tree | 216c7561f1dcc90ee0559340713dad6f6dcbced3 /src/plugins/resourceeditor/resourcenode.h | |
| parent | 90ad2797eba573b275514ba487a787cf4036842b (diff) | |
ProjectExplorer: Add special handling for removing files
... from a project which are pulled in via wildcards.
Such files cannot be removed from a project file, because they are
not listed verbatim. This kind of failure should not be reported to the
user if the file is also deleted, as the file list will have the correct
state after the next reparse.
Fixes: QTCREATORBUG-22586
Done-with: Christian Kandeler <christian.kandeler@qt.io>
Change-Id: I3dc66fe9a6594be7d0b86f46d830cd099ee49fd7
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor/resourcenode.h')
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index 181172a7fe..daa0442bd9 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -43,7 +43,8 @@ public: bool supportsAction(ProjectExplorer::ProjectAction action, const Node *node) const override; bool addFiles(const QStringList &filePaths, QStringList *notAdded) override; - bool removeFiles(const QStringList &filePaths, QStringList *notRemoved) override; + ProjectExplorer::RemovedFilesFromProject removeFiles(const QStringList &filePaths, + QStringList *notRemoved) override; bool addPrefix(const QString &prefix, const QString &lang); bool removePrefix(const QString &prefix, const QString &lang); @@ -70,7 +71,8 @@ public: QString displayName() const override; bool addFiles(const QStringList &filePaths, QStringList *notAdded) override; - bool removeFiles(const QStringList &filePaths, QStringList *notRemoved) override; + ProjectExplorer::RemovedFilesFromProject removeFiles(const QStringList &filePaths, + QStringList *notRemoved) override; bool canRenameFile(const QString &filePath, const QString &newFilePath) override; bool renameFile(const QString &filePath, const QString &newFilePath) override; |