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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/functions.prf | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 36af78f33..b7509d4d0 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -74,11 +74,29 @@ defineReplace(gnPath) { return($$out) } -defineReplace(gnArgs) { +defineReplace(gnWebEngineArgs) { + linux { + include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri) + include($$QTWEBENGINE_ROOT/src/core/config/linux.pri) + } + macos { + include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri) + include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) + } + win32 { + include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) + include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) + } + isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) + return($$gn_args) +} + +defineReplace(gnPdfArgs) { linux: include($$QTWEBENGINE_ROOT/src/buildtools/config/linux.pri) macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri) - ios: include($$QTWEBENGINE_ROOT/src/buildtools/config/ios.pri) + ios: include($$QTWEBENGINE_ROOT/src/pdf/config/ios.pri) win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) + include($$QTWEBENGINE_ROOT/src/pdf/config/common.pri) isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) return($$gn_args) } |