Merge remote-tracking branch 'origin/2.5'

2 files changed, 12 insertions, 1 deletions

diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp
index 4de678563d..45fb4bdee3 100644
--- a/src/plugins/bookmarks/bookmark.cpp
+++ b/src/plugins/bookmarks/bookmark.cpp
@@ -70,6 +70,16 @@ void Bookmark::updateBlock(const QTextBlock &block)
     }
 }
 
+void Bookmark::updateFileName(const QString &fileName)
+{
+    m_fileName = fileName;
+    QFileInfo fi(fileName);
+    m_onlyFile = fi.fileName();
+    m_path = fi.path();
+    m_manager->updateBookmark(this);
+    BaseTextMark::updateFileName(fileName);
+}
+
 QString Bookmark::lineText() const
 {
     return m_lineText;
diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h
index 62d55f7d1b..f26a66920f 100644
--- a/src/plugins/bookmarks/bookmark.h
+++ b/src/plugins/bookmarks/bookmark.h
@@ -54,6 +54,7 @@ public:
 
     void updateLineNumber(int lineNumber);
     void updateBlock(const QTextBlock &block);
+    void updateFileName(const QString &fileName);
     void removedFromEditor();
 
     QString filePath() const;
@@ -63,7 +64,7 @@ public:
 
 private:
     BookmarkManager *m_manager;
-    const QString m_fileName;
+    QString m_fileName;
     QString m_onlyFile;
     QString m_path;
     QString m_lineText;