diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2014-02-09 19:40:59 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 15:28:24 +0100 |
| commit | c08fb0e70efe3e8b3e53d2a6cbe64320c21aec2e (patch) | |
| tree | 59d9650ba17e33d1039404b6edceda0bbfeecdb2 /Source | |
| parent | 4a859b901746c6ef66f9cba8ed477fca72d05172 (diff) | |
| download | qtwebkit-c08fb0e70efe3e8b3e53d2a6cbe64320c21aec2e.tar.gz | |
Fix linker errors when Qt is built statically.
moc_qwebkitplatformplugin.o was both present in libWebKit1.a and
libQt5WebKitWidgets.a resulting in "multiple definition of" errors
when building apps against a static webkit.
Change-Id: I180b6288f39d9862a1b828f1bf295889b8e99955
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/widgetsapi.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index 335e37114..a92fbeac1 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -127,7 +127,6 @@ HEADERS += \ $$PWD/WebKit/qt/WidgetApi/qwebview.h \ $$PWD/WebKit/qt/WidgetApi/qwebinspector.h \ $$PWD/WebKit/qt/WidgetApi/qwebinspector_p.h \ - $$PWD/WebKit/qt/Api/qwebkitplatformplugin.h \ $$PWD/WebKit/qt/WidgetSupport/InitWebKitQt.h \ $$PWD/WebKit/qt/WidgetSupport/InspectorClientWebPage.h \ $$PWD/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h \ @@ -138,6 +137,10 @@ HEADERS += \ $$PWD/WebKit/qt/WidgetSupport/QStyleFacadeImp.h \ $$PWD/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h \ +!contains(QT_CONFIG, static) { + HEADERS += $$PWD/WebKit/qt/Api/qwebkitplatformplugin.h +} + contains(QT_CONFIG, accessibility) { SOURCES += $$PWD/WebKit/qt/WidgetApi/qwebviewaccessible.cpp HEADERS += $$PWD/WebKit/qt/WidgetApi/qwebviewaccessible_p.h |