[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/libs/webkitkde
From: Urs Wolfer <uwolfer () kde ! org>
Date: 2010-01-30 15:27:57
Message-ID: 1264865277.786271.16298.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1082452 by uwolfer:
Rename webkitkde to kwebkitpart (this folder will be removed soon; things will move to kdereview as \
kwebitpart).
Albert, can you please organize the translation stuff? Catalog got renamed to kwebkitpart.
CCMAIL:aacid@kde.org
M +8 -7 CMakeLists.txt
M +1 -1 Messages.sh
M +9 -1 README
A cmake (directory) part/cmake#1082446
A icons (directory) part/icons#1082446
D part (directory)
A src (directory) part#1082446
M +1 -10 src/CMakeLists.txt
D src/README
D src/cmake (directory)
D src/icons (directory)
M +3 -3 src/kwebkitpart.cpp
M +1 -1 src/kwebkitpart_p.cpp
M +1 -1 src/webpage.h
M +1 -1 src/webview.h
D webkitkde.kdev4
--- trunk/playground/libs/webkitkde/CMakeLists.txt #1082451:1082452
@@ -1,19 +1,20 @@
-project(webkitkde)
+project(kwebkitpart)
# search packages used by KDE
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit) # required; otherwise kdewebkit_export.h \
cannot be found when building from toplevel (just temporary until kdewebkit is in kdelibs) -uwolfer \
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
- ${CMAKE_SOURCE_DIR}/kdewebkit/cmake/modules
- ${CMAKE_SOURCE_DIR}/part/cmake/modules)
-
if(${KDE_VERSION} VERSION_LESS 4.3.80)
+ message("Building with kdewebkit lib from playground...")
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit) # required; otherwise kdewebkit_export.h \
cannot be found when building from toplevel (just temporary until kdewebkit is in kdelibs) -uwolfer \
add_subdirectory(kdewebkit) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} \
${CMAKE_SOURCE_DIR}/kdewebkit/cmake/modules) endif(${KDE_VERSION} VERSION_LESS 4.3.80)
-add_subdirectory(part)
+add_subdirectory(cmake)
+add_subdirectory(icons)
+add_subdirectory(src)
add_subdirectory(kdelauncher)
--- trunk/playground/libs/webkitkde/Messages.sh #1082451:1082452
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name '*.rc' -or -name '*.ui'` >> rc.cpp || exit 11
-$XGETTEXT `find . -name '*.cpp'` -o $podir/webkitkde.pot
+$XGETTEXT `find . -name '*.cpp'` -o $podir/kwebkitpart.pot
rm -f rc.cpp
--- trunk/playground/libs/webkitkde/README #1082451:1082452
@@ -1,5 +1,13 @@
Qt 4.5 or greater with QtWebkKit support is required for building the KDE WebKit
-integration.
+integration (KWebKitPart).
+You can switch between the different rendering engines:
+View -> View Mode -> {KHTML, WebKit} (Website needs to be opened)
+If WebKit does not show up in Konqueror, run 'kbuildsycoca4'.
+
+If you want to set the WebKit part as default, run:
+'keditfiletype text/html'
+and move "WebKit (kwebkitpart)" in the "Embedding" tab to the top.
+
For more information about this project please see also:
http://techbase.kde.org/Projects/WebKit
--- trunk/playground/libs/webkitkde/src/CMakeLists.txt #1082446:1082452
@@ -1,16 +1,7 @@
-project(kwebkitpart)
-
-# search packages used by KDE
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-
-include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-add_subdirectory(cmake)
add_subdirectory(includes)
-add_subdirectory(icons)
set(kwebkit_LIB_SRCS
kwebkitpart.cpp
--- trunk/playground/libs/webkitkde/src/kwebkitpart.cpp #1082446:1082452
@@ -138,11 +138,11 @@
KWebKitPart::KWebKitPart(QWidget *parentWidget, QObject *parent, const QStringList &/*args*/)
:KParts::ReadOnlyPart(parent), d(new KWebKitPartPrivate(this))
{
- KAboutData about = KAboutData("kwebkitpart", "webkitkde", ki18n("WebKit HTML Component"),
+ KAboutData about = KAboutData("kwebkitpart", "kwebkitpart", ki18n("WebKit HTML Component"),
/*version*/ "0.9", /*ki18n("shortDescription")*/ KLocalizedString(),
KAboutData::License_LGPL,
- ki18n("(c) 2009 Dawit Alemayehu\n"
- "(c) 2008-2009 Urs Wolfer\n"
+ ki18n("(c) 2009-2010 Dawit Alemayehu\n"
+ "(c) 2008-2010 Urs Wolfer\n"
"(c) 2007 Trolltech ASA"));
about.addAuthor(ki18n("Laurent Montel"), KLocalizedString(), "montel@kde.org");
--- trunk/playground/libs/webkitkde/src/kwebkitpart_p.cpp #1082446:1082452
@@ -33,7 +33,7 @@
#include "settings/webkitsettings.h"
#include "ui/passwordbar.h"
#include "ui/searchbar.h"
-#include <kdewebkit/kwebwallet.h>
+#include <kwebwallet.h>
#include <KDE/KLocalizedString>
#include <KDE/KStringHandler>
--- trunk/playground/libs/webkitkde/src/webpage.h #1082446:1082452
@@ -24,7 +24,7 @@
#ifndef WEBPAGE_H
#define WEBPAGE_H
-#include <kdewebkit/kwebpage.h>
+#include <kwebpage.h>
#include <QtCore/QUrl>
#include <QtCore/QDebug>
--- trunk/playground/libs/webkitkde/src/webview.h #1082446:1082452
@@ -29,7 +29,7 @@
#include <KDE/KParts/ReadOnlyPart>
#include <KDE/KParts/BrowserExtension>
-#include <kdewebkit/kwebview.h>
+#include <kwebview.h>
class KUrl;
class KWebKitPart;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic