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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/kttsplugin
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2009-11-29 12:28:10
Message-ID: 1259497690.536684.13744.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056111 by uwolfer:

Adopt to recent kdewebkit move to kdelibs.
(Not really sure what config-kttsplugin.h.cmake file is good for...)

 M  +8 -16     CMakeLists.txt  
 M  +1 -3      config-kttsplugin.h.cmake  
 M  +2 -2      khtmlkttsd.cpp  


--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/CMakeLists.txt #1056110:1056111
@@ -5,13 +5,6 @@
 
 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)
@@ -19,11 +12,10 @@
         set(WEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_WebKitPart)
 
-if( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
-    set( HAVE_WEBKITKDE true)
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
+if(WEBKITPART_FOUND)
+    set(HAVE_WEBKITPART true)
     include_directories(${WEBKITPART_INCLUDE_DIR})
-endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
+endif(WEBKITPART_FOUND)
 
 
 configure_file(config-kttsplugin.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kttsplugin.h ) @@ -37,9 +29,9 @@
 
 target_link_libraries(khtmlkttsdplugin  ${KDE4_KHTML_LIBS} )
 
-if( KDEWEBKIT_FOUND AND WEBKITPART_FOUND)
-    target_link_libraries(khtmlkttsdplugin ${WEBKITPART_LIBRARIES} \
                ${KDEWEBKIT_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
-endif(KDEWEBKIT_FOUND AND WEBKITPART_FOUND)
+if(WEBKITPART_FOUND)
+    target_link_libraries(khtmlkttsdplugin ${WEBKITPART_LIBRARIES} \
${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY} ) +endif(WEBKITPART_FOUND)
 
 
 install(TARGETS khtmlkttsdplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -48,6 +40,6 @@
 ########### install files ###############
 
 install( FILES khtmlkttsd.rc khtmlkttsd.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/khtml/kpartplugins )
-if( KDEWEBKIT_FOUND AND WEBKITPART_FOUND)
+if(WEBKITPART_FOUND)
    install( FILES khtmlkttsd.rc khtmlkttsd.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/webkitpart/kpartplugins )
-endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND)
+endif(WEBKITPART_FOUND)
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/config-kttsplugin.h.cmake \
#1056110:1056111 @@ -1,3 +1 @@
-#cmakedefine HAVE_WEBKITKDE 1
-
-#cmakedefine HAVE_WEBVIEW 1
+#cmakedefine HAVE_WEBKITPART 1
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #1056110:1056111
@@ -35,7 +35,7 @@
 #include <kspeech.h>
 #include <ktoolinvocation.h>
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
 #include <webkitpart.h>
 #include <QWebFrame>
 #include <QWebView>
@@ -110,7 +110,7 @@
                 query = compPart->htmlDocument().body().innerText().string();
         }
     }
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
     else
     {
         WebKitPart *webkitPart = dynamic_cast<WebKitPart *>(part);


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