Diff
Modified: trunk/Source/WebKit/qt/Api/qwebkitglobal.h (136393 => 136394)
--- trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -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();
Modified: trunk/Source/WebKit/qt/ChangeLog (136393 => 136394)
--- trunk/Source/WebKit/qt/ChangeLog 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-12-03 14:52:00 UTC (rev 136394)
@@ -1,3 +1,25 @@
+2012-12-03 Pierre Rossi <pierre.ro...@digia.com>
+
+ [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets
+ https://bugs.webkit.org/show_bug.cgi?id=103844
+
+ 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.
+
2012-11-30 Pierre Rossi <pierre.ro...@gmail.com>
[Qt] Introduce setTextSizeMultiplier in the page adapter as well.
Modified: trunk/Source/WebKit/qt/WidgetApi/qgraphicswebview.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetApi/qgraphicswebview.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetApi/qgraphicswebview.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -37,7 +37,7 @@
class QGraphicsWebViewPrivate;
-class QWEBKIT_EXPORT QGraphicsWebView : public QGraphicsWidget {
+class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget {
Q_OBJECT
Q_PROPERTY(QString title READ title NOTIFY titleChanged)
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebframe.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetApi/qwebframe.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebframe.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -63,7 +63,7 @@
class QWebHitTestResultPrivate;
class QWebFrame;
-class QWEBKIT_EXPORT QWebHitTestResult {
+class QWEBKITWIDGETS_EXPORT QWebHitTestResult {
public:
QWebHitTestResult();
QWebHitTestResult(const QWebHitTestResult &other);
@@ -104,7 +104,7 @@
friend class QWebPage;
};
-class QWEBKIT_EXPORT QWebFrame : public QObject {
+class QWEBKITWIDGETS_EXPORT QWebFrame : public QObject {
Q_OBJECT
Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebinspector.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetApi/qwebinspector.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebinspector.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -27,7 +27,7 @@
class QWebInspectorPrivate;
-class QWEBKIT_EXPORT QWebInspector : public QWidget {
+class QWEBKITWIDGETS_EXPORT QWebInspector : public QWidget {
Q_OBJECT
public:
QWebInspector(QWidget* parent = 0);
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebpage.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetApi/qwebpage.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebpage.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -65,7 +65,7 @@
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 @@
Geolocation
};
- class QWEBKIT_EXPORT ViewportAttributes {
+ class QWEBKITWIDGETS_EXPORT ViewportAttributes {
public:
ViewportAttributes();
ViewportAttributes(const QWebPage::ViewportAttributes& other);
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebview.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetApi/qwebview.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebview.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -38,7 +38,7 @@
class QWebViewPrivate;
class QWebNetworkRequest;
-class QWEBKIT_EXPORT QWebView : public QWidget {
+class QWEBKITWIDGETS_EXPORT QWebView : public QWidget {
Q_OBJECT
Q_PROPERTY(QString title READ title)
Q_PROPERTY(QUrl url READ url WRITE setUrl)
Modified: trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp 2012-12-03 14:52:00 UTC (rev 136394)
@@ -30,7 +30,7 @@
namespace WebKit {
-Q_DECL_EXPORT void initializeWebKitWidgets()
+QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets()
{
static bool initialized = false;
if (initialized)
Modified: trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h (136393 => 136394)
--- trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h 2012-12-03 14:28:52 UTC (rev 136393)
+++ trunk/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h 2012-12-03 14:52:00 UTC (rev 136394)
@@ -21,9 +21,11 @@
#ifndef InitWebKitQt_h
#define InitWebKitQt_h
+#include <qwebkitglobal.h>
+
namespace WebKit {
-Q_DECL_EXPORT void initializeWebKitWidgets();
+QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets();
}
#endif
