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 /src/src.pro | |
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 'src/src.pro')
-rw-r--r-- | src/src.pro | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/src.pro b/src/src.pro index 0247f937e..143fd00ab 100644 --- a/src/src.pro +++ b/src/src.pro @@ -7,12 +7,17 @@ include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pr 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 pdf-private pdfwidgets-private +QT_FOR_CONFIG += \ + buildtools-private \ + webenginecore \ + webenginecore-private \ + webengine-private \ + webenginewidgets-private \ + pdf-private \ + pdfwidgets-private TEMPLATE = subdirs - qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { core.depends = buildtools process.depends = core @@ -43,9 +48,9 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { 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 + SUBDIRS += pdf plugins.depends += pdf qtConfig(pdf-widgets) { pdfwidgets.depends = pdf @@ -53,12 +58,6 @@ qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { } } -!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 - QMAKE_EXTRA_TARGETS += errorbuild - first.depends += errorbuild - QMAKE_EXTRA_TARGETS += first - } -} +# this needs to be last line for qmake -r +qtConfig(build-qtwebengine-core):!contains(SUBDIRS, core): SUBDIRS += core +qtConfig(build-qtpdf):!contains(SUBDIRS, pdf): SUBDIRS += pdf |