From 5742b3288b2494d03149f439182a189ba9330a47 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Mon, 3 Dec 2012 15:16:56 +0100 Subject: [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets https://bugs.webkit.org/show_bug.cgi?id=103844 Patch by Pierre Rossi on 2012-12-03 Reviewed by Simon Hausmann. Let's follow the common practice and have one export macro per library. We can't rely on BUILDING_WEBKIT anymore in that case, so we use the qmake defines instead. * Api/qwebkitglobal.h: Updated the import/export logic. * WidgetApi/qgraphicswebview.h: s/QWEBKIT/QWEBKITWIDGETS/ * WidgetApi/qwebframe.h: Ditto. * WidgetApi/qwebinspector.h: Ditto. * WidgetApi/qwebpage.h: Ditto. * WidgetApi/qwebview.h: Ditto. * WidgetSupport/InitWebKitQt.cpp: (WebKit::initializeWebKitWidgets): use QWEBKITWIDGETS_EXPORT. * WidgetSupport/InitWebKitQt.h: (WebKit): Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136394 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I0030f2f17cddd66aedf24f29323579174e838303 Reviewed-by: Pierre Rossi --- Source/WebKit/qt/WidgetApi/qwebpage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/qt/WidgetApi/qwebpage.h') diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h index 5624b499b..6aa303b5c 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.h +++ b/Source/WebKit/qt/WidgetApi/qwebpage.h @@ -65,7 +65,7 @@ namespace WebCore { struct FrameLoadRequest; } -class QWEBKIT_EXPORT QWebPage : public QObject { +class QWEBKITWIDGETS_EXPORT QWebPage : public QObject { Q_OBJECT Q_PROPERTY(bool modified READ isModified) @@ -213,7 +213,7 @@ public: Geolocation }; - class QWEBKIT_EXPORT ViewportAttributes { + class QWEBKITWIDGETS_EXPORT ViewportAttributes { public: ViewportAttributes(); ViewportAttributes(const QWebPage::ViewportAttributes& other); -- cgit v1.2.1