From 5cc7263a9113244414493722bb7724275bf52ec8 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Fri, 22 Oct 2010 20:48:19 +0200
Subject: 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.
---
 linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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 @@
  */
 
 #include "llqtwebkit.h"
+#include <qglobal.h>		// for Q_INIT_RESOURCE
 
 #include "linden_common.h"
 #include "indra_constants.h" // for indra keyboard codes
@@ -720,6 +721,9 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_
 	mJavascriptEnabled = true;	// default to on
 	mPluginsEnabled = true;		// default to on
 	mUserAgent = "LLPluginMedia Web Browser";
+
+	// Initialize WebCore resource.
+	Q_INIT_RESOURCE(WebCore);
 }
 
 MediaPluginWebKit::~MediaPluginWebKit()
-- 
cgit v1.1