diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 18:22:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-01 19:03:09 +0100 |
| commit | 3d0d0afe573d1c568f1f5c0eba647eff993dcb81 (patch) | |
| tree | 4c05b09f478233f3156c7f4c1a5cb0fb5ee2a597 /examples/webengine | |
| parent | 30aa9c7bf0f1eceda8516fd5de87dc8e2cff1758 (diff) | |
| parent | 399d77a38ff52d33dc871a5b221db253308b7436 (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/core/core_module.pro
src/core/delegated_frame_node.cpp
src/core/surface_factory_qt.cpp
src/webenginewidgets/api/qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
Diffstat (limited to 'examples/webengine')
| -rw-r--r-- | examples/webengine/webengine.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/webengine/webengine.pro b/examples/webengine/webengine.pro index 3f55888cb..b20b8f118 100644 --- a/examples/webengine/webengine.pro +++ b/examples/webengine/webengine.pro @@ -3,5 +3,9 @@ TEMPLATE=subdirs SUBDIRS += \ customdialogs \ minimal \ - quicknanobrowser \ - recipebrowser + quicknanobrowser + +qtHaveModule(quickcontrols2) { + SUBDIRS += \ + recipebrowser +} |