[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:       2010-01-31 16:08:59
Message-ID: 1264954139.394497.28848.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083091 by uwolfer:

Port to recent change of KWebKitPart in kdereview.

 M  +15 -15    CMakeLists.txt  
 M  +1 -1      config-kttsplugin.h.cmake  
 M  +2 -2      khtmlkttsd.cpp  


--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/CMakeLists.txt #1083090:1083091
@@ -5,17 +5,17 @@
 
 include(MacroOptionalDependPackage)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "kwebkitpart")
-if(DEPEND_PACKAGE_WebKitPart)
-        macro_optional_find_package(WebKitPart QUIET)
-else(DEPEND_PACKAGE_WebKitPart)
-        set(WEBKITPART_FOUND FALSE)
-endif(DEPEND_PACKAGE_WebKitPart)
+MACRO_OPTIONAL_DEPEND_PACKAGE(KWebKitPart "kwebkitpart")
+if(DEPEND_PACKAGE_KWebKitPart)
+        macro_optional_find_package(KWebKitPart QUIET)
+else(DEPEND_PACKAGE_KWebKitPart)
+        set(KWEBKITPART_FOUND FALSE)
+endif(DEPEND_PACKAGE_KWebKitPart)
 
-if(WEBKITPART_FOUND)
-    set(HAVE_WEBKITPART true)
-    include_directories(${WEBKITPART_INCLUDE_DIR})
-endif(WEBKITPART_FOUND)
+if(KWEBKITPART_FOUND)
+    set(HAVE_KWEBKITPART true)
+    include_directories(${KWEBKITPART_INCLUDE_DIR})
+endif(KWEBKITPART_FOUND)
 
 
 configure_file(config-kttsplugin.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kttsplugin.h ) @@ -29,9 +29,9 @@
 
 target_link_libraries(khtmlkttsdplugin  ${KDE4_KHTML_LIBS} )
 
-if(WEBKITPART_FOUND)
-    target_link_libraries(khtmlkttsdplugin ${WEBKITPART_LIBRARIES} \
                ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY} )
-endif(WEBKITPART_FOUND)
+if(KWEBKITPART_FOUND)
+    target_link_libraries(khtmlkttsdplugin ${KWEBKITPART_LIBRARIES} \
${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY} ) +endif(KWEBKITPART_FOUND)
 
 
 install(TARGETS khtmlkttsdplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -40,6 +40,6 @@
 ########### install files ###############
 
 install( FILES khtmlkttsd.rc khtmlkttsd.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/khtml/kpartplugins )
-if(WEBKITPART_FOUND)
+if(KWEBKITPART_FOUND)
    install( FILES khtmlkttsd.rc khtmlkttsd.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/kwebkitpart/kpartplugins )
-endif(WEBKITPART_FOUND)
+endif(KWEBKITPART_FOUND)
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/config-kttsplugin.h.cmake \
#1083090:1083091 @@ -1 +1 @@
-#cmakedefine HAVE_WEBKITPART 1
+#cmakedefine HAVE_KWEBKITPART 1
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #1083090:1083091
@@ -35,7 +35,7 @@
 #include <kspeech.h>
 #include <ktoolinvocation.h>
 
-#ifdef HAVE_WEBKITPART
+#ifdef HAVE_KWEBKITPART
 #include <kwebkitpart.h>
 #include <QWebFrame>
 #include <QWebView>
@@ -110,7 +110,7 @@
                 query = compPart->htmlDocument().body().innerText().string();
         }
     }
-#ifdef HAVE_WEBKITPART
+#ifdef HAVE_KWEBKITPART
     else
     {
         KWebKitPart *webkitPart = dynamic_cast<KWebKitPart *>(part);


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