diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-06-26 14:39:52 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-06-26 15:05:42 +0200 |
| commit | d61623deb70b510663d7c8d74733ab948156dd49 (patch) | |
| tree | abbdd0d2f350de1634312ec03f38ca6d343bfa05 /src | |
| parent | 21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b (diff) | |
Fix crash when loading context menu on Windows.
Use QUrl::fromLocalFile to load components from the installation
Qml directory. Using just the absolute file path wasn't a problem
on Linux, but did not work on Windows.
Other Qt modules are also using QUrl::fromLocalFile to do this.
Change-Id: I689c516dc63a6c966435eedb94441d7c9246dd25
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index 969a46758..104b2c333 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -164,7 +164,7 @@ bool UIDelegatesManager::ensureComponentLoaded(ComponentType type) if (!fi.exists()) return false; // FIXME: handle async loading - *component = (new QQmlComponent(engine, QUrl(fi.absoluteFilePath()), QQmlComponent::PreferSynchronous, m_view)); + *component = (new QQmlComponent(engine, QUrl::fromLocalFile(fi.absoluteFilePath()), QQmlComponent::PreferSynchronous, m_view)); if ((*component)->status() != QQmlComponent::Ready) { #ifdef UI_DELEGATES_DEBUG |