From b6832e33d91685eed92ee06aa33885348236624d Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sun, 13 Mar 2011 22:12:37 +0000
Subject: disable webview kvs object for qt < 4.6 fixed xmlreader doc

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5587 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/KvsObject_webView.cpp   | 2 +-
 src/modules/objects/KvsObject_webView.h     | 2 +-
 src/modules/objects/KvsObject_xmlreader.cpp | 4 ++--
 src/modules/objects/libkviobjects.cpp       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/objects')

diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 02981a0b3..a2742ef8f 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -25,7 +25,7 @@
 //
 
 #include "kvi_settings.h"
-#ifdef COMPILE_WEBKIT_SUPPORT
+#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
 #include <QtWebKit/QWebView>
 #include <QWebSettings>
 #include <QWebElement>
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index 1f29dc03b..046d2e36b 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#ifdef COMPILE_WEBKIT_SUPPORT
+#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
 #include "object_macros.h"
 #include <QFile>
 #include <QNetworkAccessManager>
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 247834783..e72545d2b 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -45,8 +45,8 @@
 		This class implements a really simple xml document parser.
 		You will usually derive your own class from this one and reimplement
 		some of the events that it triggers.
-		You will typically reimplement [classfnc:xmlparser]onElementStart[/classfnc]()
-		and [classfnc:xmlparser]onElementEnd[/classfnc]() that will be called
+		You will typically reimplement [classfnc:xmlparser]$onElementStart[/classfnc]()
+		and [classfnc:xmlparser]$onElementEnd[/classfnc]() that will be called
 		during the execution of [classfnc:xmlparser]$parse[/classfnc]() in an order
 		reflecting the order of elements in the parsed document.
 	@functions:
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index d3e7fa28b..8a274b7d7 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -63,7 +63,7 @@
 #include "KvsObject_treeWidget.h"
 #include "KvsObject_treeWidgeteItem.h"
 #include "KvsObject_vBox.h"
-#ifdef COMPILE_WEBKIT_SUPPORT
+#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
 #include "KvsObject_webView.h"
 #endif
 #include "KvsObject_widget.h"
@@ -99,7 +99,7 @@ static bool objects_module_cleanup(KviModule *)
 {
 	// Don't attempt to change the order of these calls.
 	// Derived classes must be unregistered before the base ones.
-	#ifdef COMPILE_WEBKIT_SUPPORT
+	#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
 	KvsObject_webView::unregisterSelf();
 	#endif
         KvsObject_memoryBuffer::unregisterSelf();
@@ -807,7 +807,7 @@ static bool objects_module_init(KviModule * m)
         KvsObject_trayIcon::registerSelf();
 	KvsObject_process::registerSelf();
 	KvsObject_memoryBuffer::registerSelf();
-	#ifdef COMPILE_WEBKIT_SUPPORT
+	#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
 	KvsObject_webView::registerSelf();
 	#endif
 	return true;
-- 
cgit v1.3.1-10-gc9f91