diff -up kde-runtime-4.9.2/drkonqi/CMakeLists.txt.webkit kde-runtime-4.9.2/drkonqi/CMakeLists.txt --- kde-runtime-4.9.2/drkonqi/CMakeLists.txt.webkit 2012-09-28 02:16:14.000000000 +0200 +++ kde-runtime-4.9.2/drkonqi/CMakeLists.txt 2012-10-11 15:28:21.060908131 +0200 @@ -76,12 +76,14 @@ kde4_add_ui_files(drkonqi_SRCS # Comment this out for release. #add_definitions(-DBACKTRACE_PARSER_DEBUG) +# no webkit +set (KDERUNTIME_NO_WEBKIT TRUE) +add_definitions(-DKDERUNTIME_NO_WEBKIT) + kde4_add_executable(drkonqi ${drkonqi_SRCS}) target_link_libraries(drkonqi ${KDE4_KIO_LIBS} - ${QT_QTWEBKIT_LIBRARY} - ${KDE4_KDEWEBKIT_LIBRARY} ${KDEPIMLIBS_KXMLRPCCLIENT_LIBRARY} drkonqi_backtrace_parser ) diff -up kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp.webkit kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp --- kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp.webkit 2012-09-28 02:16:14.000000000 +0200 +++ kde-runtime-4.9.2/drkonqi/reportassistantpages_bugzilla.cpp 2012-10-11 15:28:21.061908093 +0200 @@ -46,7 +46,11 @@ /* Unhandled error dialog includes */ #include +#ifdef KDERUNTIME_NO_WEBKIT +#include +#else #include +#endif #include #include #include @@ -774,8 +778,11 @@ UnhandledErrorDialog::UnhandledErrorDial setAttribute(Qt::WA_DeleteOnClose); +#ifdef KDERUNTIME_NO_WEBKIT + QTextBrowser * htmlView = new QTextBrowser(this); +#else KWebView * htmlView = new KWebView(this); - +#endif QLabel * iconLabel = new QLabel(this); iconLabel->setFixedSize(32, 32); iconLabel->setPixmap(KIcon("dialog-warning").pixmap(32, 32)); diff -up kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt.webkit kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt --- kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt.webkit 2012-09-28 02:16:14.000000000 +0200 +++ kde-runtime-4.9.2/kioslave/thumbnail/CMakeLists.txt 2012-10-11 15:28:21.061908093 +0200 @@ -76,18 +76,6 @@ install(TARGETS textthumbnail DESTINATIO ########### next target ############### -if(NOT WINCE) -set(htmlthumbnail_PART_SRCS htmlcreator.cpp) - -kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS}) - -target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS}) - -install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) -endif(NOT WINCE) - -########### next target ############### - if(NOT WIN32) set(djvuthumbnail_PART_SRCS djvucreator.cpp) diff -up kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt --- kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt.webkit 2012-09-28 02:16:15.000000000 +0200 +++ kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/CMakeLists.txt 2012-10-11 15:28:21.062908056 +0200 @@ -1,5 +1,8 @@ project(graphicswidgetsbindings) +set (PLASMA_NO_KDEWEBKIT TRUE) +add_definitions(-DPLASMA_NO_KDEWEBKIT) + set(graphicswidgetsbindings_SRCS graphicswidgetsbindingsplugin.cpp declarativetabbar.cpp diff -up kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp --- kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.webkit 2012-09-28 02:16:15.000000000 +0200 +++ kde-runtime-4.9.2/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp 2012-10-11 15:30:57.913033942 +0200 @@ -47,8 +47,9 @@ #include #include #include +#ifndef PLASMA_NO_KDEWEBKIT #include - +#endif #include "declarativetabbar.h" SignalPlotter::SignalPlotter(QGraphicsItem *parent) @@ -99,7 +100,9 @@ void GraphicsWidgetsBindingsPlugin::regi qmlRegisterType(uri, 0, 1, "ToolButton"); qmlRegisterType(uri, 0, 1, "TreeView"); qmlRegisterType(uri, 0, 1, "VideoWidget"); +#ifndef PLASMA_NO_KDEWEBKIT qmlRegisterType(uri, 0, 1, "WebView"); +#endif } diff -up kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt.webkit kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt --- kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt.webkit 2012-09-28 02:16:15.000000000 +0200 +++ kde-runtime-4.9.2/plasma/scriptengines/javascript/CMakeLists.txt 2012-10-11 15:28:21.062908056 +0200 @@ -7,6 +7,9 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL set(PLASMA_NO_KIO TRUE) endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) +set (PLASMA_NO_KDEWEBKIT TRUE) +add_definitions(-DPLASMA_NO_KDEWEBKIT) + set(simple_javascript_engine_SRCS common/extension_launchapp.cpp common/extension_io.cpp diff -up kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp --- kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp.webkit 2012-09-28 02:16:15.000000000 +0200 +++ kde-runtime-4.9.2/plasma/scriptengines/javascript/simplebindings/uiloader.cpp 2012-10-11 15:28:21.063908019 +0200 @@ -49,7 +49,9 @@ #include #include #include +#ifndef PLASMA_NO_KDEWEBKIT #include +#endif #include @@ -78,7 +80,9 @@ QGraphicsWidget *createTextEdit(QGraphic QGraphicsWidget *createToolButton(QGraphicsWidget *parent) { return new Plasma::ToolButton(parent); } QGraphicsWidget *createTreeView(QGraphicsWidget *parent) { return new Plasma::TreeView(parent); } QGraphicsWidget *createVideoWidget(QGraphicsWidget *parent) { return new Plasma::VideoWidget(parent); } +#ifndef PLASMA_NO_KDEWEBKIT QGraphicsWidget *createWebView(QGraphicsWidget *parent) { return new Plasma::WebView(parent); } +#endif QGraphicsWidget *createGraphicsWidget(QGraphicsWidget *parent) { return new QGraphicsWidget(parent); } UiLoader::UiLoader() @@ -108,8 +112,10 @@ UiLoader::UiLoader() m_widgetCtors.insert("ToolButton", createToolButton); m_widgetCtors.insert("TreeView", createTreeView); m_widgetCtors.insert("VideoWidget", createVideoWidget); +#ifndef PLASMA_NO_KDEWEBKIT m_widgetCtors.insert("WebView", createWebView); m_widgetCtors.insert("GraphicsWidget", createWebView); +#endif } UiLoader::~UiLoader()