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