summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/components
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-08 09:05:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-08 09:05:09 (GMT)
commitb1c908af60a60cf14d68914e1075f8cf6add760b (patch)
tree6043a253a78cca6bad0b70553738db82258f6fea /tools/designer/src/components
parent0766bf2fa4a89e629bbdad185e4919fd49c033a1 (diff)
parentca622c6919248a9b15550d3116d3b094f88dd1fa (diff)
downloadQt-b1c908af60a60cf14d68914e1075f8cf6add760b.zip
Qt-b1c908af60a60cf14d68914e1075f8cf6add760b.tar.gz
Qt-b1c908af60a60cf14d68914e1075f8cf6add760b.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Set dirty correctly in case resource paths were changed.
Diffstat (limited to 'tools/designer/src/components')
-rw-r--r--tools/designer/src/components/formeditor/qdesigner_resource.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 0426b8c..714a556 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -2278,6 +2278,7 @@ void QDesignerResource::createResources(DomResources *resources)
path = core()->dialogGui()->getOpenFileName(dialogParent, fileDialogTitle, fi.absolutePath(), fileDialogPattern);
if (path.isEmpty())
break;
+ m_formWindow->setProperty("_q_resourcepathchanged", QVariant(true));
} else {
break;
}