diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-07-13 11:21:22 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-10-27 13:14:00 +0000 |
| commit | dbf1c2eb9f4e1feb24a58699b7b550016802e386 (patch) | |
| tree | b087f5b1ab6f1e224985911f93002f648021df3c /mkspecs | |
| parent | 2f83e38bfc02f790162d2a2cdcbaef668d39448d (diff) | |
QMake: Add option to set qt.conf file.
Change-Id: Ie5db11892ccf2d357773a4db6a0464bf27be9a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 6b37a04450..92c288cdb6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -67,7 +67,9 @@ defineTest(qtCompileTest) { mkpath($$test_out_dir)|error("Aborting.") - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { + !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF + + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { log("yes$$escape_expand(\\n)") msg = "test $$1 succeeded" |