diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-05-22 14:43:10 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-05-29 00:08:46 +0200 |
| commit | d92ceaaa10ca2d783608aeddfeba27554e3319dc (patch) | |
| tree | 148bcc07c8fae7e4d5fc4a720b418c44904a63fd /examples | |
| parent | e9e2f9442ab88a853f511476e35efe8d15186c68 (diff) | |
Fix 'qmake -r' run
Use current configure instead of qtHaveModule().
Change-Id: Ifc4500ff5eee4b997a0c02fb387d8918f88d06d1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 +} |