Properly track modification status due to changes in merge or merge source.

2016-05-15 14:26:03 -04:00
parent 003641b8f2
commit a30af8eeab
3 changed files with 66 additions and 64 deletions
@@ -80,6 +80,7 @@ signals:
 	/////////////////////////////////
 public:
 	bool isModified() const;
+	void setModified();
 	void clearModified();

 	QString shortName();
@@ -207,6 +208,7 @@ public:
 private slots:
 	void onObjectChanged();
 	void onObjectMoved();
+	void onMergeSourceChanged();


 	/////////////////////////////////