summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDamian Jansen <damian.jansen@nokia.com>2010-11-23 02:04:23 (GMT)
committerDamian Jansen <damian.jansen@nokia.com>2010-11-23 02:04:23 (GMT)
commit787fd44a917f31d52b35cf168f2821d23d8be694 (patch)
tree11f4cce92d4ba82483ccdb9e0862f47b950d2c74 /tools
parente158714ea545bd74600f121ab726cf2cf848f3b9 (diff)
downloadQt-787fd44a917f31d52b35cf168f2821d23d8be694.zip
Qt-787fd44a917f31d52b35cf168f2821d23d8be694.tar.gz
Qt-787fd44a917f31d52b35cf168f2821d23d8be694.tar.bz2
Prevent crash when calling reload() from within a .qml
Task-number: QTBUG-15493
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qmlruntime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 78bc409..7ea77d1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -1012,7 +1012,7 @@ void QDeclarativeViewer::addPluginPath(const QString& plugin)
void QDeclarativeViewer::reload()
{
- open(currentFileOrUrl);
+ launch(currentFileOrUrl);
}
void QDeclarativeViewer::openFile()