summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/configure_base.prf
Commit message (Collapse)AuthorAgeFilesLines
* improve handling of test commands which produce outputOswald Buddenhagen2016-08-181-2/+6
| | | | | | | | | | | | | | | | | | never use $$system() directly, but instead use qtRunLoggedCommand() with a newly introduced out parameter. that way we can print the command's raw output, which should help debugging configure problems. additionally, we now consistently check the exit code of all executed commands, which should avoid confusing followup errors. note that as a side effect some calls now use $$system()'s 'lines' mode instead of the bizarre default splitting mode. this has no impact on any of the cases, which is why it is basically a negligible style change at this point. however, qtLog() gained support for arguments with more than one element to accommodate this. Change-Id: I40d907e27de32dfec8d6086ce7d93fc4be18241f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* use qtLog() to also print command outputOswald Buddenhagen2016-08-111-2/+1
| | | | | Change-Id: I950bc86b0b2dafcb8f2369478f391dc05280194f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix configure qtLog()Oswald Buddenhagen2016-08-111-4/+3
| | | | | | | | its actual function was qtLogCommand(), but all callers outside configure_base.prf apparently didn't know that. adjust implementation. Change-Id: I910d4ba33c6f31debc81c37e3bfff1a288190355 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make sure that we capture the entire test command's outputOswald Buddenhagen2016-08-111-1/+1
| | | | | | | | the command can be a compound statement (usually 'foo && bar' style), so enclose it in parens before redirecting stderr. Change-Id: Ib72a2c8ddfd17bf9457e9cfe2652121258ce9a64 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* add support for returning the command's exit status to $$system()Oswald Buddenhagen2016-08-101-6/+3
| | | | | | | ... and make use of it in qtRunLoggedCommand(). Change-Id: I242dfde344f555800cef1f55d3cb85418a93277f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-231-1/+11
| | | | | | | | | | | | | Conflicts: mkspecs/common/mac.conf mkspecs/features/configure_base.prf mkspecs/features/configure.prf mkspecs/macx-clang-32/qmake.conf mkspecs/macx-clang/qmake.conf mkspecs/macx-ios-clang/qmake.conf src/network/ssl/qsslsocket_openssl_symbols_p.h Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
* Let qmake do most of the work of configuring QtLars Knoll2016-06-221-0/+44
Command line arguments, configure tests and features are now defined in a json file and a configure.pri containing some custom functions. qmake uses the json file to determine command line arguments, tests and features to be executed at configuration time. A new qt_configure.prf contains all the infrastructure to parse the command line, run the configure tests, determine the set of available features and create a report about it. Change-Id: If30ac089dd3e9f8c67ebd642bde10cfa960893bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 01:34:08 +0000