diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 16:49:15 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-17 15:22:28 +0100 |
| commit | 1f7c5244e3adeccf42f0583358f0787498f2661b (patch) | |
| tree | 4b8a03628682f3d6bd847c09d8cf415dce7c6c48 /src/src.pro | |
| parent | 8412b9b3442345b17fe6618a56ed9ed08dfb7417 (diff) | |
| parent | 6025803547477884fe1d027b7cb54a70429337c6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Blacklists tst_Accessibility::focusChild() for now.
Conflicts:
src/core/api/core_api.pro
src/core/net/plugin_response_interceptor_url_loader_throttle.h
src/process/process.pro
Change-Id: I95821a3851120dc16673f4c760e802952eae5c41
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index e32d915d6..0247f937e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,9 +4,11 @@ include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-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 webenginecore webenginecore-private webengine-private \ - webenginewidgets-private + webenginewidgets-private pdf-private pdfwidgets-private TEMPLATE = subdirs @@ -38,7 +40,20 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { } } -!qtConfig(webengine-core-support): qtConfig(build-qtwebengine-core) { +qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { + pdf.depends = buildtools + qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support): pdf.depends += core + SUBDIRS += pdf + !contains(SUBDIRS, buildtools): SUBDIRS += buildtools + !contains(SUBDIRS, plugins): SUBDIRS += plugins + plugins.depends += pdf + qtConfig(pdf-widgets) { + pdfwidgets.depends = pdf + SUBDIRS += pdfwidgets + } +} + +!qtConfig(webengine-core-support):if(qtConfig(build-qtwebengine-core)|qtConfig(build-qtpdf)) { !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass { errorbuild.commands = @echo $$shell_quote(Modules will not be built. $${skipBuildReason}) errorbuild.CONFIG = phony |