diff options
| -rw-r--r-- | Source/WebKit/qt/Api/qwebkitglobal.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h index 6ee30ca24..44e4d45b7 100644 --- a/Source/WebKit/qt/Api/qwebkitglobal.h +++ b/Source/WebKit/qt/Api/qwebkitglobal.h @@ -27,7 +27,7 @@ #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) #ifndef QT_STATIC -# if defined(QT_BUILD_WEBKIT_LIB) +# if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT) # define QWEBKIT_EXPORT Q_DECL_EXPORT # else # define QWEBKIT_EXPORT Q_DECL_IMPORT diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index cd979f678..9c4d5c461 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,3 +1,11 @@ +2012-12-04 Pierre Rossi <pierre.rossi@digia.com> + + [Qt] Yet another unreviewed speculative windows build fix. + + WebKit2 relies on the QWEBKIT_EXPORT macro from WebKit1 as well. + + * Api/qwebkitglobal.h: + 2012-12-03 Pierre Rossi <pierre.rossi@digia.com> [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets |