alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plasma::WebView has KDE integration since now (using KWebKit)

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1090803
This commit is contained in:
Davide Bettio 2010-02-16 02:41:14 +00:00
parent 32683cd664
commit 12300374db
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -6,6 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES}
${KDE4_KIO_INCLUDES}
${CMAKE_SOURCE_DIR}/kdewebkit/
${CMAKE_SOURCE_DIR}/knewstuff/
${CMAKE_BINARY_DIR}/solid/
${CMAKE_SOURCE_DIR}/solid/
@ -210,7 +211,7 @@ endif(PHONON_FOUND)
kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} knewstuff3
${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} kdewebkit
kdnssd threadweaver ${KDE4_SOLID_LIBS} )
if(QCA2_FOUND)

4
widgets/webview.cpp
View File

@ -28,11 +28,11 @@
#include <fixx11h.h>
#include <QtWebKit/QWebFrame>
#include <QtWebKit/QWebPage>
#include <QtCore/QTimer>
#include <kdebug.h>
#include <kwebpage.h>
#include <kio/accessmanager.h>
#include <accessmanager.h>
@ -75,7 +75,7 @@ WebView::WebView(QGraphicsItem *parent)
setAcceptsHoverEvents(true);
setFlags(QGraphicsItem::ItemIsFocusable);
QWebPage *page = new QWebPage(this);
QWebPage *page = new KWebPage(this);
page->setNetworkAccessManager(new KIO::AccessManager(page));
QPalette palette = qApp->palette();
palette.setBrush(QPalette::Base, Qt::transparent);