From kde-commits  Sat Nov 07 15:54:01 2009
From: Urs Wolfer <uwolfer () kde ! org>
Date: Sat, 07 Nov 2009 15:54:01 +0000
To: kde-commits
Subject: branches/KDE/4.3/kdenetwork/kget/extensions/konqueror
Message-Id: <1257609241.329366.4812.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125760964621560

SVN commit 1046123 by uwolfer:

Backport:
SVN commit 1038919 by cfeck:

Compile with latest WebKitKDE

BUG:213243

 M  +0 -2      CMakeLists.txt  
 M  +1 -5      kget_plug_in.cpp  


--- branches/KDE/4.3/kdenetwork/kget/extensions/konqueror/CMakeLists.txt #1046122:1046123
@@ -18,8 +18,6 @@
     add_definitions(-DHAVE_WEBKITKDE)
     include_directories(${KDEWEBKIT_INCLUDE_DIR})
     include_directories(${WEBKITPART_INCLUDE_DIR})
-    FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${KDEWEBKIT_INCLUDE_DIR})
-    macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW )
     set(WEBKITKDE_FOUND true)
 endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
 
--- branches/KDE/4.3/kdenetwork/kget/extensions/konqueror/kget_plug_in.cpp #1046122:1046123
@@ -33,11 +33,7 @@
 
 #ifdef HAVE_WEBKITKDE
 #include <webkitpart.h>
-#ifdef HAVE_WEBVIEW
-#include <webview.h>
-#else
-#include <webkitview.h>
-#endif
+#include <QWebView>
 #include <QWebFrame>
 #endif