summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorJarek Kobus <jkobus@trolltech.com>2009-04-17 06:59:50 (GMT)
committerJarek Kobus <jkobus@trolltech.com>2009-04-17 06:59:50 (GMT)
commitfa58c0e9afecc3807bd76babbd5da3918afcdd3d (patch)
tree4895431d492b093b1e2ee29032fa82999a8ed09b /tools/designer
parent04c01e15739d926ef653293ef1e89132085d7acd (diff)
parent8eb08c8c294f00763961e86cc3370b0ef78c8976 (diff)
downloadQt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.zip
Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.gz
Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/components/propertyeditor/designerpropertymanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 1b267aa..346da18 100644
--- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -271,7 +271,7 @@ void TextEditor::fileActionActivated()
const QString newPath = m_core->dialogGui()->getOpenFileName(this, tr("Choose a File"), oldPath);
if (newPath.isEmpty() || newPath == oldPath)
return;
- const QString newText = QLatin1String("file:") + newPath;
+ const QString newText = QUrl::fromLocalFile(newPath).toString();
m_editor->setText(newText);
emit textChanged(newText);
}