diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-24 23:00:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-24 23:00:14 (GMT) |
| commit | 7be365682055db5791e5854d9695c62b942205ab (patch) | |
| tree | 59c974e33681c87b39f2d221a4f00f78ed74378e /tools/qml | |
| parent | 862eda78461ad7f4e2a30cc7b6467ace0abf88a9 (diff) | |
| parent | 422282c4f3e439990abc6c6b79699d943b9541d7 (diff) | |
| download | Qt-7be365682055db5791e5854d9695c62b942205ab.zip Qt-7be365682055db5791e5854d9695c62b942205ab.tar.gz Qt-7be365682055db5791e5854d9695c62b942205ab.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
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() |