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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/kttsplugin
From:       Laurent Montel <montel () kde ! org>
Date:       2008-07-17 12:14:27
Message-ID: 1216296867.504723.32027.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 833784 by mlaurent:

Compil with old header


 M  +5 -3      CMakeLists.txt  
 M  +2 -0      config-kttsplugin.h.cmake  
 M  +4 -0      khtmlkttsd.cpp  


--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/CMakeLists.txt #833783:833784
@@ -14,14 +14,16 @@
 
 macro_bool_to_01(WEBKITKDE_FOUND HAVE_WEBKITKDE)
 
-configure_file(config-kttsplugin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kttsplugin.h )
-
-
 if( WEBKITKDE_FOUND )
    include_directories(${WEBKITKDE_INCLUDE_DIR})
+   FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${WEBKITKDE_INCLUDE_DIR})
+   macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW )
 endif(WEBKITKDE_FOUND)
 
 
+configure_file(config-kttsplugin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kttsplugin.h )
+
+
 set(khtmlkttsdplugin_PART_SRCS khtmlkttsd.cpp )
 
 qt4_add_dbus_interfaces(khtmlkttsdplugin_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/config-kttsplugin.h.cmake #833783:833784
@@ -1 +1,3 @@
 #cmakedefine HAVE_WEBKITKDE 1
+
+#cmakedefine HAVE_WEBVIEW 1
--- trunk/KDE/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #833783:833784
@@ -26,7 +26,11 @@
 #include "config-kttsplugin.h"
 #ifdef HAVE_WEBKITKDE
 #include <webkitpart.h>
+#ifdef HAVE_WEBVIEW
 #include <webview.h>
+#else
+#include <webkitview.h>
+#endif
 #include <QWebFrame>
 #endif
 #include <kicon.h>
[prev in list] [next in list] [prev in thread] [next in thread]