diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-29 09:44:38 +0100 |
| commit | 8a164aa2cd83d728ce620c2b7199ebc6222b55cb (patch) | |
| tree | e63e01795baafd41e2a65641d21eb00469bed0c5 /src/webenginewidgets/webenginewidgets.pro | |
| parent | 5480a26d2f16dacfbce47da337559b5bcfb3d45e (diff) | |
| parent | f9eb2b95fcdb4df82d3ba8c4aab44347a2bad452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/core/web_event_factory.cpp
src/core/web_event_factory.h
src/webengine/render_widget_host_view_qt_delegate_quick.h
Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
Diffstat (limited to 'src/webenginewidgets/webenginewidgets.pro')
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 958dec07b..37cb7a1f0 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -46,17 +46,17 @@ HEADERS = \ api/qwebengineview_p.h \ render_widget_host_view_qt_delegate_widget.h -qtConfig(ui-delegates) { +qtConfig(webengine-ui-delegates) { SOURCES += ui/messagebubblewidget.cpp HEADERS += ui/messagebubblewidget_p.h DEFINES += QT_UI_DELEGATES } -qtConfig(spellchecker) { +qtConfig(webengine-spellchecker) { DEFINES += ENABLE_SPELLCHECK } -qtConfig(printing-and-pdf) { +qtConfig(webengine-printing-and-pdf) { DEFINES += ENABLE_PRINTING DEFINES += ENABLE_PDF QT += printsupport |