diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2012-12-03 15:16:56 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2012-12-03 15:58:16 +0100 |
| commit | 5742b3288b2494d03149f439182a189ba9330a47 (patch) | |
| tree | a82e805a535ddfe89e59eddec175837f99070970 /Source/WebKit/qt/Api/qwebkitglobal.h | |
| parent | b71580caec90bb8c4f0193b131b608e49003ba63 (diff) | |
| download | qtwebkit-5742b3288b2494d03149f439182a189ba9330a47.tar.gz | |
[Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets
https://bugs.webkit.org/show_bug.cgi?id=103844
Patch by Pierre Rossi <pierre.rossi@digia.com> 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 <pierre.rossi@gmail.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qwebkitglobal.h')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebkitglobal.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h index 1d61182c8..5b866beb7 100644 --- a/Source/WebKit/qt/Api/qwebkitglobal.h +++ b/Source/WebKit/qt/Api/qwebkitglobal.h @@ -27,13 +27,19 @@ #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) #ifndef QT_STATIC -# if defined(BUILDING_WEBKIT) +# if defined(QT_BUILD_WEBKIT_LIB) # define QWEBKIT_EXPORT Q_DECL_EXPORT # else # define QWEBKIT_EXPORT Q_DECL_IMPORT # endif +# if defined(QT_BUILD_WEBKITWIDGETS_LIB) +# define QWEBKITWIDGETS_EXPORT Q_DECL_EXPORT +# else +# define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT +# endif #else # define QWEBKIT_EXPORT +# define QWEBKIT_EXPORT #endif QWEBKIT_EXPORT QString qWebKitVersion(); |