diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-20 19:34:03 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-07 09:49:04 +0000 |
commit | 4abee8c89a47592fecd4c0f9247efa600710a06b (patch) | |
tree | 26d10b4460d46113f942f15edd4098db2f9fdbd2 | |
parent | 7a166952325d9f4ea59afcf74e2cb2763a5f7d37 (diff) |
move setup of QTWEBENGINE_ROOT to .qmake conf
less effort, more standardized.
Change-Id: Iee03d85b2d3fea2721a5271874b876f411ef8ce9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | .qmake.conf | 4 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5237fb5fd..5ebfda16c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,8 @@ QMAKEPATH += $$PWD/tools/qmake + +# Resolve root directories for sources +QTWEBENGINE_ROOT = $$PWD + load(qt_build_config) CONFIG += warning_clean diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 27aded013..1557a0533 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -1,6 +1,3 @@ -# Resolve root directories for sources -QTWEBENGINE_ROOT = $$replace(PWD, /tools/qmake/mkspecs/features$,) - # We depend on libc++ to build chromium so our macosx-version-min has to be 10.7 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 |