diff options
| author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-11-21 13:14:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-21 13:29:45 +0100 |
| commit | 38e575fa1b4885ddccb13a12dcdc19cad2f329c9 (patch) | |
| tree | ba54b0b5ec9fd3efa7c13fe4ca432a179e590f83 /src/shared/qrceditor/resourceview.h | |
| parent | 5ab4e69fbac61e3e52ed25527285ff73a36593dc (diff) | |
| download | qt-creator-38e575fa1b4885ddccb13a12dcdc19cad2f329c9.tar.gz | |
Fix assert on undo in qrc editor
Before creating AddFilesCommand we check if
files to be added are already in qrc file. If they all are in
we don't create AddFilesCommand.
Task-number: QTCREATORBUG-6508
Change-Id: I633f7393f1185023052ceaa0465282e1dc7957a2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/shared/qrceditor/resourceview.h')
| -rw-r--r-- | src/shared/qrceditor/resourceview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/qrceditor/resourceview.h b/src/shared/qrceditor/resourceview.h index a00afd95a4..5b8a458fa9 100644 --- a/src/shared/qrceditor/resourceview.h +++ b/src/shared/qrceditor/resourceview.h @@ -117,6 +117,7 @@ public: void findSamePlacePostDeletionModelIndex(int &row, QModelIndex &parent) const; EntryBackup *removeEntry(const QModelIndex &index); + QStringList existingFilesSubtracted(int prefixIndex, const QStringList &fileNames) const; void addFiles(int prefixIndex, const QStringList &fileNames, int cursorFile, int &firstFile, int &lastFile); void removeFiles(int prefixIndex, int firstFileIndex, int lastFileIndex); |