diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:49:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:53:49 +0100 |
| commit | 6189de6015764dd4a14774f2e08344c4cd085f69 (patch) | |
| tree | aaadc8bf672ffde1d7bfa3080eeec416271a6c5c /src/webenginewidgets/webenginewidgets.pro | |
| parent | ea2dafb7d07500e83b59fd708a9634a5e1135425 (diff) | |
| parent | 6bb3d98e47d89790049edca796843345b8fd3c8b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc,
use the macro \macos.
Conflicts:
src/core/media_capture_devices_dispatcher.cpp
src/webengine/doc/src/qtwebengine-deploying.qdoc
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
Diffstat (limited to 'src/webenginewidgets/webenginewidgets.pro')
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index cd9a2d10b..279ec79f8 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -4,7 +4,7 @@ TARGET = QtWebEngineWidgets DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB QT += webenginecore widgets network quick -QT_PRIVATE += quick-private gui-private core-private +QT_PRIVATE += quick-private gui-private core-private widgets-private INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api |