diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 08:50:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 08:50:12 (GMT) |
| commit | caca740ea1219227008c303b5f2fac24af5a62a0 (patch) | |
| tree | fd5908b8e7accaca33697c98ccd7cb9a6ea84157 /tools | |
| parent | 236e57bc9d85c4b05514dd3b792bf8e144320023 (diff) | |
| parent | 5149da5a564c883209566f3baaeea15932eee1c2 (diff) | |
| download | Qt-caca740ea1219227008c303b5f2fac24af5a62a0.zip Qt-caca740ea1219227008c303b5f2fac24af5a62a0.tar.gz Qt-caca740ea1219227008c303b5f2fac24af5a62a0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix incorrect example for Qt.rgba()
Flickable and MouseArea were too eager to take/keep mouse grab.
Allow javascript date and regexp objects in WorkerScript messages
Avoid lockup in ListView when animating delegates.
Fix asynchronous reload call in test, broken by previous submit
Update QtGui emulator def file for bug QT-3971
Ignore .pc/
Ensure WebView press delay timer is cancelled when grab is taken.
Prevent crash when calling reload() from within a .qml
Diffstat (limited to 'tools')
| -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() |