summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2016-12-07 13:55:20 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2016-12-07 13:55:20 +0100
commitc7f8e360da41df8b81004fe45f1582845a951c2b (patch)
tree32cf6ecb336af7d89a0a86153bb07ee49f23baa9 /tools
parent3d000cfc013158f56c0b088c9ee99b03938ef50b (diff)
parent5ec330cec86cd7781ced295790ce93ac8748dcc4 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: src/3rdparty Change-Id: Ie7b7c469aa24716816a23b8fe7a8df9f477a9f67
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf3
-rw-r--r--tools/qmake/mkspecs/features/functions.prf2
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index c6f07e39..bb4c56ca 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -78,6 +78,9 @@ defineTest(runConfigure) {
else: log("System NSS not found, BoringSSL will be used.$${EOL}")
}
}
+ !cross_compile {
+ WEBENGINE_CONFIG += enable_pdf
+ }
isQtMinimum(5, 8) {
include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
QT_FOR_CONFIG += webengine-private
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index fbd92b13..8191f758 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -292,7 +292,7 @@ defineReplace(getConfigDir) {
}
defineReplace(getChromiumSrcDir) {
- git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
+ exists($$QTWEBENGINE_ROOT/.git): git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
# Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
return($$git_chromium_src_dir)