1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: during early setup, skip all of default_pre.prf

Browse Source 
... instead of only toolchain.prf.
the license check could go haywire, and everything else that file does
is meaningless in configure context anyway.

Task-number: QTBUG-63452
Change-Id: I5e31c87fe717fda40978c0317556070637e537e2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-12-06 11:02:07 +01:00
parent 0a8a759822
commit 7830cdd833
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/default_pre.prf
View File

@ -2,6 +2,9 @@
# Note that evaluating variable assignments from the command line # Note that evaluating variable assignments from the command line
# still happens in between these two steps. # still happens in between these two steps.
# In early configure setup; nothing useful to be done here.
isEmpty(QMAKE_CXX): return()
load(exclusive_builds) load(exclusive_builds)
CONFIG = \ CONFIG = \
lex yacc debug exceptions depend_includepath \ lex yacc debug exceptions depend_includepath \

3
mkspecs/features/toolchain.prf
View File

@ -1,7 +1,4 @@
# In early configure setup; nothing useful to be done here.
isEmpty(QMAKE_CXX): return()
defineReplace(qtMakeExpand) { defineReplace(qtMakeExpand) {
out = "$$1" out = "$$1"
for(ever) { for(ever) {