diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-29 09:27:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-29 09:27:09 +0200 |
commit | bdeb49e55617ce42fd7d93075badec5f147bedf8 (patch) | |
tree | db1089078d3b15495d041c2ab3dddc9f81d30d44 /examples | |
parent | 4bdccc8abcd7ab3a80c0d84fd005452d5ffceb6b (diff) | |
parent | 1a26c0ace958c3604c8a751134429dd38168a1a1 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/src.pro
Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index b4f411aeb..c62d7c04d 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,9 +1,25 @@ -TEMPLATE=subdirs -qtHaveModule(webengine): SUBDIRS += webengine +include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/pdfwidgets/qtpdfwidgets-config.pri) + +QT_FOR_CONFIG += \ + buildtools-private \ + webengine-private \ + webenginewidgets-private \ + pdf-private \ + pdfwidgets-private -qtHaveModule(webenginewidgets): SUBDIRS += webenginewidgets +TEMPLATE=subdirs -qtHaveModule(pdfwidgets): SUBDIRS += pdfwidgets +qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { + qtConfig(webengine-qml): SUBDIRS += webengine + qtConfig(webengine-widgets): SUBDIRS += webenginewidgets +} -qtHaveModule(quick): qtHaveModule(pdf): qtHaveModule(pdfwidgets): SUBDIRS += pdf +qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { + SUDIRS += pdf + qtConfig(pdf-widgets): SUBDIRS += pdfwidgets +} |