~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/konqueror/kttsplugin/khtmlkttsd.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-12-02 13:28:20 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20091202132820-yaqzqr7livmarip5
Tags: 4:4.3.80-0ubuntu1
* New upstream release:
  - Drop kubuntu_05_konsole_colour_scheme.diff, applied upstream
  - Drop kubuntu_15-17.diff, applied upstream
  - Bump build-depend versions
  - Add build-depend on shared-desktop-ontologies for nepomuk support
  - Update various .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
#include <kspeech.h>
36
36
#include <ktoolinvocation.h>
37
37
 
38
 
#ifdef HAVE_WEBKITKDE
 
38
#ifdef HAVE_WEBKITPART
39
39
#include <webkitpart.h>
40
40
#include <QWebFrame>
41
41
#include <QWebView>
110
110
                query = compPart->htmlDocument().body().innerText().string();
111
111
        }
112
112
    }
113
 
#ifdef HAVE_WEBKITKDE
 
113
#ifdef HAVE_WEBKITPART
114
114
    else
115
115
    {
116
116
        WebKitPart *webkitPart = dynamic_cast<WebKitPart *>(part);