diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:53:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-16 14:53:22 +0200 |
| commit | 208701af7425fb38d7426f3133a21a2a28bac390 (patch) | |
| tree | 9044f134356bd7a58964d9a0ca65e56936bdbe31 | |
| parent | a786971e5fe6daeb4465237f5d47bf10acb45d49 (diff) | |
| download | qtwebkit-208701af7425fb38d7426f3133a21a2a28bac390.tar.gz | |
[Qt] Fix inconsistent DLL linkage on Windows with WebKit1
https://bugs.webkit.org/show_bug.cgi?id=91375
Reviewed by NOBODY (OOPS!).
Export QWebHistoryItemPrivate as required for tests. Unfortunately we cannot use
Q_AUTOTEST_EXPORT outside of Qt.
* Api/qwebhistory_p.h:
| -rw-r--r-- | Source/WebKit/qt/Api/qwebhistory_p.h | 3 | ||||
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Source/WebKit/qt/Api/qwebhistory_p.h b/Source/WebKit/qt/Api/qwebhistory_p.h index 44793b990..aaee38632 100644 --- a/Source/WebKit/qt/Api/qwebhistory_p.h +++ b/Source/WebKit/qt/Api/qwebhistory_p.h @@ -22,12 +22,13 @@ #include "BackForwardListImpl.h" #include "HistoryItem.h" +#include "qwebkitglobal.h" #include <QtCore/qglobal.h> #include <QtCore/qshareddata.h> class QWebPagePrivate; -class Q_AUTOTEST_EXPORT QWebHistoryItemPrivate : public QSharedData { +class QWEBKIT_EXPORT QWebHistoryItemPrivate : public QSharedData { public: static QExplicitlySharedDataPointer<QWebHistoryItemPrivate> get(QWebHistoryItem* q) { diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index 6d26ea21c..90d358893 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,3 +1,15 @@ +2012-07-16 Simon Hausmann <simon.hausmann@nokia.com> + + [Qt] Fix inconsistent DLL linkage on Windows with WebKit1 + https://bugs.webkit.org/show_bug.cgi?id=91375 + + Reviewed by NOBODY (OOPS!). + + Export QWebHistoryItemPrivate as required for tests. Unfortunately we cannot use + Q_AUTOTEST_EXPORT outside of Qt. + + * Api/qwebhistory_p.h: + 2012-07-12 Huang Dongsung <luxtella@company100.net> [Qt] Increase the drawing performance by merging dirty rects. |