diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-19 21:54:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-06 16:34:03 +0000 |
| commit | ad51c8aa0a00c1bbec7386472ca454079e284051 (patch) | |
| tree | 4b27ebf94d9d47d8fcf656487ef5a1486b3a0d46 /configure.pri | |
| parent | e1c93cc74b43d8c49208b38dde824298590ac788 (diff) | |
make more use of configure QMAKE_*= arguments in native builds
don't ignore the variable assignments for host tools when we're not
actually cross-building.
(sort of) amends 5060740f.
Task-number: QTBUG-58511
Change-Id: Ideda25fb18a4e0b2d54179b08b6301b94a48e51c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index b7dd9d460f..d49f5f8db2 100644 --- a/configure.pri +++ b/configure.pri @@ -997,7 +997,7 @@ defineTest(qtConfOutput_gccSysroot) { defineTest(qtConfOutput_qmakeArgs) { !$${2}: return() - $${currentConfig}.output.privatePro = "!host_build {" + $${currentConfig}.output.privatePro = "!host_build|!cross_compile {" for (a, config.input.qmakeArgs) { $${currentConfig}.output.privatePro += " $$a" EXTRA_QMAKE_ARGS += $$system_quote($$a) |