[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kget/extensions/konqueror
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2009-11-29 12:26:15
Message-ID: 1259497575.925442.13610.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056109 by uwolfer:

Adopt to recent kdewebkit move to kdelibs.

 M  +10 -18    CMakeLists.txt  
 M  +3 -3      kget_plug_in.cpp  


--- trunk/KDE/kdenetwork/kget/extensions/konqueror/CMakeLists.txt #1056108:1056109
@@ -1,12 +1,5 @@
 include(MacroOptionalDependPackage)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
-if(DEPEND_PACKAGE_KdeWebKit)
-        macro_optional_find_package(KdeWebKit QUIET)
-else(DEPEND_PACKAGE_KdeWebKit)
-        set(KDEWEBKIT_FOUND FALSE)
-endif(DEPEND_PACKAGE_KdeWebKit)
-
 MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "webkitpart")
 if(DEPEND_PACKAGE_WebKitPart)
         macro_optional_find_package(WebKitPart QUIET)
@@ -14,15 +7,14 @@
         set(WEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_WebKitPart)
 
-if( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
-    add_definitions(-DHAVE_WEBKITKDE)
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
+if(WEBKITPART_FOUND)
+    add_definitions(-DHAVE_WEBKITPART)
     include_directories(${WEBKITPART_INCLUDE_DIR})
-    set(WEBKITKDE_FOUND true)
-endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
+    set(WEBKITPART_FOUND true)
+endif(WEBKITPART_FOUND)
 
 
-macro_log_feature(WEBKITKDE_FOUND "WebKitKde" "Webkitkde libraries and header files" \
"" FALSE "" "Webkitkde is necessary to compile support for WebKitKde.") \
+macro_log_feature(WEBKITPART_FOUND "WebKitPart" "WebKitPart libraries and header \
files" "https://svn.kde.org/home/kde/trunk/playground/libs/webkitkde" FALSE "" \
"WebKitPart is necessary to compile KGet support for WebKitPart.")  
 configure_file(config-kgetplugins.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kgetplugins.h )  
@@ -39,9 +31,9 @@
 
 target_link_libraries(khtml_kget ${KDE4_KHTML_LIBS})
 
-if( WEBKITKDE_FOUND)
-    target_link_libraries(khtml_kget ${WEBKITPART_LIBRARIES} ${KDEWEBKIT_LIBRARIES} \
                ${QT_QTWEBKIT_LIBRARY})
-endif(WEBKITKDE_FOUND)
+if( WEBKITPART_FOUND)
+    target_link_libraries(khtml_kget ${WEBKITPART_LIBRARIES} ${KDE4_KDEUI_LIBRARY} \
${QT_QTWEBKIT_LIBRARY}) +endif(WEBKITPART_FOUND)
 
 install(TARGETS khtml_kget DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -49,6 +41,6 @@
 
 install(FILES kget_plug_in.rc DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins)
 
-if (WEBKITKDE_FOUND)
+if (WEBKITPART_FOUND)
     install(FILES kget_plug_in.rc DESTINATION \
                ${DATA_INSTALL_DIR}/webkitpart/kpartplugins)
-endif (WEBKITKDE_FOUND)
+endif (WEBKITPART_FOUND)
--- trunk/KDE/kdenetwork/kget/extensions/konqueror/kget_plug_in.cpp #1056108:1056109
@@ -31,7 +31,7 @@
 #include <dom/html_document.h>
 #include <kparts/partmanager.h>
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
 #include <webkitpart.h>
 #include <QWebView>
 #include <QWebFrame>
@@ -109,7 +109,7 @@
         QWidget *parentWidget = 0;
         if (parent() && parent()->inherits("KHTMLPart"))
             parentWidget = static_cast<KHTMLPart*>(parent())->widget();
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
         if (parent() && parent()->inherits("WebKitPart"))
             parentWidget = static_cast<WebKitPart*>(parent())->view();
 #endif
@@ -158,7 +158,7 @@
         if (htmlPart)
             doc = htmlPart->htmlDocument();
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
         WebKitPart *part = qobject_cast<WebKitPart *>(parent());
         if (part) {
             doc.open();


[prev in list] [next in list] [prev in thread] [next in thread]