From d3ecf0f84bdb72cc28df16d59c736b9ffba7a57f Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Wed, 27 Oct 2010 15:53:42 +0200
Subject: Remove the need for qglobal.h on non-standalone.

---
 linden/indra/media_plugins/webkit/media_plugin_webkit.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index d4c5deb..d01cd9e 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -34,7 +34,9 @@
  */
 
 #include "llqtwebkit.h"
-#include <qglobal.h>		// for Q_INIT_RESOURCE
+#ifdef LL_STANDALONE
+#include <qglobal.h>
+#endif
 
 #include "linden_common.h"
 #include "indra_constants.h" // for indra keyboard codes
@@ -80,6 +82,16 @@ extern "C" {
 	}
 #endif
 
+// We don't provide Qt headers, so define this here for non-standalone.
+#ifndef QT_MANGLE_NAMESPACE
+#define QT_MANGLE_NAMESPACE(name) name
+#endif
+#ifndef Q_INIT_RESOURCE
+#define Q_INIT_RESOURCE(name) \
+	do { extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) ();       \
+		 QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); } while (0)
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 class MediaPluginWebKit : 
-- 
cgit v1.1