[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: 2009-10-04 15:07:17
Message-ID: 1254668837.394093.14419.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1031275 by uwolfer:
* add KDEWEBKIT_EXPORT and use it in public classes
* cleanup and prepare CMake scripts for kdelibs
M +2 -0 CMakeLists.txt
M +5 -2 kdewebkit/CMakeLists.txt
A kdewebkit/kdewebkit_export.h [License: LGPL (v2+)]
M +2 -2 kdewebkit/kwebpage.h
M +2 -2 kdewebkit/kwebpluginfactory.h
M +2 -2 kdewebkit/kwebview.h
M +2 -2 kdewebkit/settings/webkitsettings.h
--- trunk/playground/libs/webkitkde/CMakeLists.txt #1031274:1031275
@@ -5,6 +5,8 @@
include(KDE4Defaults)
include(MacroLibrary)
+include_directories(${CMAKE_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}/kdewebkit/cmake/modules
${CMAKE_SOURCE_DIR}/part/cmake/modules)
--- trunk/playground/libs/webkitkde/kdewebkit/CMakeLists.txt #1031274:1031275
@@ -5,7 +5,7 @@
include(KDE4Defaults)
include(MacroLibrary)
-include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR})
+include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/kdewebkit)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_subdirectory(includes)
@@ -33,13 +33,16 @@
${QT_QTXML_LIBRARY}
)
-#set_target_properties(kdewebkit PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION}) +#set_target_properties(kdewebkit PROPERTIES VERSION \
${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}) ### for kdelibs \
set_target_properties(kdewebkit PROPERTIES VERSION 1.0.0 SOVERSION 1) # for the moment keep something \
low...
+#install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ### for kdelibs
install(TARGETS kdewebkit ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
+ kdewebkit_export.h
kwebpage.h
kwebview.h
kwebpluginfactory.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kdewebkit/ COMPONENT Devel)
+# DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) ### for kdelibs
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.h #1031274:1031275
@@ -25,7 +25,7 @@
#ifndef KWEBPAGE_H
#define KWEBPAGE_H
-#include <kdemacros.h>
+#include <kdewebkit_export.h>
#include <QtWebKit/QWebPage>
@@ -40,7 +40,7 @@
* @since 4.4
*/
-class KDE_EXPORT KWebPage : public QWebPage
+class KDEWEBKIT_EXPORT KWebPage : public QWebPage
{
Q_OBJECT
public:
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpluginfactory.h #1031274:1031275
@@ -22,7 +22,7 @@
#ifndef KWEBPLUGINFACTORY_H
#define KWEBPLUGINFACTORY_H
-#include <kdemacros.h>
+#include <kdewebkit_export.h>
#include <QtWebKit/QWebPluginFactory>
#include <QtCore/QList>
@@ -38,7 +38,7 @@
* @since 4.4
*/
-class KDE_EXPORT KWebPluginFactory : public QWebPluginFactory
+class KDEWEBKIT_EXPORT KWebPluginFactory : public QWebPluginFactory
{
Q_OBJECT
public:
--- trunk/playground/libs/webkitkde/kdewebkit/kwebview.h #1031274:1031275
@@ -25,7 +25,7 @@
#ifndef KWEBVIEW_H
#define KWEBVIEW_H
-#include <kdemacros.h>
+#include <kdewebkit_export.h>
#include <QtWebKit/QWebView>
#include "kwebpage.h"
@@ -46,7 +46,7 @@
* @since 4.4
*/
-class KDE_EXPORT KWebView : public QWebView
+class KDEWEBKIT_EXPORT KWebView : public QWebView
{
Q_OBJECT
public:
--- trunk/playground/libs/webkitkde/kdewebkit/settings/webkitsettings.h #1031274:1031275
@@ -26,7 +26,7 @@
#include <QtGui/QColor>
#include <QtCore/QStringList>
#include <QtCore/QPair>
-#include <kdemacros.h>
+#include <kdewebkit_export.h>
struct KPerDomainSettings;
class WebKitSettingsPrivate;
@@ -34,7 +34,7 @@
/**
* Settings for the HTML view.
*/
-class KDE_EXPORT WebKitSettings
+class KDEWEBKIT_EXPORT WebKitSettings
{
public:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic