aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-05-16 14:11:36 +0200
committerTobias Hunger <tobias.hunger@qt.io>2017-05-17 11:32:02 +0000
commit8e87f32eeb166d8f5ddc28f59449f0c042722fa3 (patch)
treeabb16394136f2e1c6a160c0323b255d0a3dfc5fe /src/plugins/resourceeditor
parent800d5822efe262c1f6cdf9597392bb35791fb0ac (diff)
Resources: Trigger watcher when changing qrc file
Trigger the filesystem watcher when changing qrc files. This in turn triggers a reload and with that a refresh of the project tree. Task-number: QTCREATORBUG-17930 Change-Id: If1aa0ee6ded86594a8c35880b56e76e05e0fa214 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
-rw-r--r--src/plugins/resourceeditor/resourcenode.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index 354f56c4ee..af4b899928 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -146,7 +146,6 @@ static bool addFilesToResource(const FileName &resourceFile,
}
}
- FileChangeBlocker changeGuard(resourceFile.toString());
file.save();
return true;
@@ -418,7 +417,6 @@ bool ResourceTopLevelNode::addPrefix(const QString &prefix, const QString &lang)
int index = file.addPrefix(prefix, lang);
if (index == -1)
return false;
- FileChangeBlocker changeGuard(filePath().toString());
file.save();
return true;
@@ -433,7 +431,6 @@ bool ResourceTopLevelNode::removePrefix(const QString &prefix, const QString &la
if (file.prefix(i) == prefix
&& file.lang(i) == lang) {
file.removePrefix(i);
- FileChangeBlocker changeGuard(filePath().toString());
file.save();
return true;
}
@@ -458,7 +455,6 @@ bool ResourceTopLevelNode::removeNonExistingFiles()
}
}
- FileChangeBlocker changeGuard(filePath().toString());
file.save();
return true;
}
@@ -553,7 +549,6 @@ bool ResourceFolderNode::removeFiles(const QStringList &filePaths, QStringList *
file.removeFile(index, j);
--j;
}
- FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
return true;
@@ -592,7 +587,6 @@ bool ResourceFolderNode::renameFile(const QString &filePath, const QString &newF
for (int j = 0; j < file.fileCount(index); ++j) {
if (file.file(index, j) == filePath) {
file.replaceFile(index, j, newFilePath);
- FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
return true;
}
@@ -613,7 +607,6 @@ bool ResourceFolderNode::renamePrefix(const QString &prefix, const QString &lang
if (!file.replacePrefixAndLang(index, prefix, lang))
return false;
- FileChangeBlocker changeGuard(m_topLevelNode->filePath().toString());
file.save();
return true;
}