diff options
| -rw-r--r-- | examples/examples.pro | 26 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 25 |
2 files changed, 39 insertions, 12 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 +} diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 9b71e1183..53f223642 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,14 +1,25 @@ -TEMPLATE = subdirs -qtHaveModule(webengine) { - SUBDIRS += quick -} +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 + +TEMPLATE = subdirs -qtHaveModule(webenginewidgets) { - SUBDIRS += core widgets +qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { + qtConfig(webengine-qml): SUBDIRS += quick + qtConfig(webengine-widgets): SUBDIRS += core widgets } -qtHaveModule(pdf) { +qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { SUBDIRS += pdf } |