diff options
author | Aleric Inglewood | 2010-10-22 20:48:19 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-22 20:48:19 +0200 |
commit | 5cc7263a9113244414493722bb7724275bf52ec8 (patch) | |
tree | 0e13410d3112f0e63d0fad13a1a1dc4b0aa9620f /linden/indra/media_plugins | |
parent | Merge branch 'weekly' into webkit_plugins (diff) | |
download | meta-impy-5cc7263a9113244414493722bb7724275bf52ec8.zip meta-impy-5cc7263a9113244414493722bb7724275bf52ec8.tar.gz meta-impy-5cc7263a9113244414493722bb7724275bf52ec8.tar.bz2 meta-impy-5cc7263a9113244414493722bb7724275bf52ec8.tar.xz |
Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" at start up of the webkit plugin.
These are caused because builtin resources of QtWebKit weren't
initialized.
Diffstat (limited to 'linden/indra/media_plugins')
-rwxr-xr-x | linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp index 5058e0a..d4c5deb 100755 --- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | |||
@@ -34,6 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "llqtwebkit.h" | 36 | #include "llqtwebkit.h" |
37 | #include <qglobal.h> // for Q_INIT_RESOURCE | ||
37 | 38 | ||
38 | #include "linden_common.h" | 39 | #include "linden_common.h" |
39 | #include "indra_constants.h" // for indra keyboard codes | 40 | #include "indra_constants.h" // for indra keyboard codes |
@@ -720,6 +721,9 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_ | |||
720 | mJavascriptEnabled = true; // default to on | 721 | mJavascriptEnabled = true; // default to on |
721 | mPluginsEnabled = true; // default to on | 722 | mPluginsEnabled = true; // default to on |
722 | mUserAgent = "LLPluginMedia Web Browser"; | 723 | mUserAgent = "LLPluginMedia Web Browser"; |
724 | |||
725 | // Initialize WebCore resource. | ||
726 | Q_INIT_RESOURCE(WebCore); | ||
723 | } | 727 | } |
724 | 728 | ||
725 | MediaPluginWebKit::~MediaPluginWebKit() | 729 | MediaPluginWebKit::~MediaPluginWebKit() |