diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-03-07 09:56:58 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-03-07 09:56:58 +0100 |
commit | ca622c6919248a9b15550d3116d3b094f88dd1fa (patch) | |
tree | 042bb37259d9f8c30d5fb71ba9481d9421de974e /tools/designer/src/designer | |
parent | 2525432106823ff3df7f6bb2d44c0a376356a1a8 (diff) | |
download | qt4-tools-ca622c6919248a9b15550d3116d3b094f88dd1fa.tar.gz |
Designer: Set dirty correctly in case resource paths were changed.
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-17918
Diffstat (limited to 'tools/designer/src/designer')
-rw-r--r-- | tools/designer/src/designer/qdesigner_formwindow.cpp | 1 | ||||
-rw-r--r-- | tools/designer/src/designer/qdesigner_workbench.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/designer/src/designer/qdesigner_formwindow.cpp b/tools/designer/src/designer/qdesigner_formwindow.cpp index 1fbdcec03d..4770d2a58b 100644 --- a/tools/designer/src/designer/qdesigner_formwindow.cpp +++ b/tools/designer/src/designer/qdesigner_formwindow.cpp @@ -159,6 +159,7 @@ void QDesignerFormWindow::firstShow() if (m_editor) { connect(m_editor, SIGNAL(fileNameChanged(QString)), this, SLOT(updateWindowTitle(QString))); updateWindowTitle(m_editor->fileName()); + updateChanged(); } } show(); diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp index 836feb75f0..840667afe1 100644 --- a/tools/designer/src/designer/qdesigner_workbench.cpp +++ b/tools/designer/src/designer/qdesigner_workbench.cpp @@ -966,7 +966,9 @@ QDesignerFormWindow * QDesignerWorkbench::loadForm(const QString &fileName, return 0; } *uic3Converted = editor->fileName().isEmpty(); - editor->setDirty(false); + // Did user specify another (missing) resource path -> set dirty. + const bool dirty = editor->property("_q_resourcepathchanged").toBool(); + editor->setDirty(dirty); resizeForm(formWindow, editor->mainContainer()); formWindowManager->setActiveFormWindow(editor); return formWindow; |