summaryrefslogtreecommitdiff
path: root/src/plugins/designer
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2012-04-05 18:24:26 +0200
committerEike Ziller <eike.ziller@nokia.com>2012-04-05 18:24:26 +0200
commit9ec6e9f7e094eee2eb55c777332c33b7a99f11f0 (patch)
tree81066a933a52f1988f9cab7d574d2123803846d9 /src/plugins/designer
parente6565936e0b820e073927b64a28f9b4c621dbeaa (diff)
parentf521c9f0628fc89ddc41a1584d65369f9c07a2f3 (diff)
downloadqt-creator-9ec6e9f7e094eee2eb55c777332c33b7a99f11f0.tar.gz
Merge remote-tracking branch 'origin/2.5'
Diffstat (limited to 'src/plugins/designer')
-rw-r--r--src/plugins/designer/formwindowfile.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 0b05e675ed..eea63511e8 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -104,9 +104,11 @@ bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSa
return false;
}
+ const QString oldFileName = m_fileName;
m_fileName = fi.absoluteFilePath();
emit setDisplayName(fi.fileName());
m_formWindow->setDirty(false);
+ emit fileNameChanged(oldFileName, m_fileName);
emit changed();
emit saved();
@@ -117,8 +119,10 @@ void FormWindowFile::rename(const QString &newName)
{
m_formWindow->setFileName(newName);
QFileInfo fi(newName);
+ const QString oldFileName = m_fileName;
m_fileName = fi.absoluteFilePath();
emit setDisplayName(fi.fileName());
+ emit fileNameChanged(oldFileName, m_fileName);
emit changed();
}