summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_configure.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix the linkerSupportsFlag configure test typeLars Knoll2016-07-151-1/+1
| | | | | Change-Id: Iefc874958d1f6d2447f9774a9c3cdf6d7a3b885b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Replace EXTRA_LIBS with EXTRA_LIBDIR and EXTRA_FRAMEWORKPATHLars Knoll2016-07-131-2/+4
| | | | | | | | Now that -l and -fw options are gone, using a combined EXTRA_LIBS makes no sense anymore and only complicates things. Change-Id: Ic12bf482f3bed041aff7f0891f008b1f34ae2b4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix log messageLars Knoll2016-07-081-1/+1
| | | | | Change-Id: I0192d3a3073038d98e72ce7abd3bf1ecae002989 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Make more configure tests work on WindowsLars Knoll2016-07-051-12/+18
| | | | | Change-Id: I87d775de7b6d790a44bbc3c9598d617ad57d9d4c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix handling of -v/-verbose command line flags to configureLars Knoll2016-07-021-0/+7
| | | | | | | | This is not a feature that should get propagated to other configure runs, so simply hardcode support for it. Change-Id: Ieb1c33243154b3583e91061d3592d7e87c36f402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Call arch test through the new qmake based configure systemLars Knoll2016-07-021-9/+14
| | | | | | | | Detect host and target architecture from within qmake, and set QT_ARCH accordingly. Change-Id: I30255f88c7645d197bd07355a1dff02b377cbbe8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Allow passing configure opts with two dashes againFrederik Gladhorn2016-07-011-5/+5
| | | | | | | | | The regexp were capturing too greedy: $$replace(c, "^--?(.*)", "\\1") changes --developer-build to -developer-build. Do not accidentally capture the second dash. Change-Id: I19586a1678fc3bf3f450ec31f5bd7e71e9514b34 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* pass pkg-config environment to qmake invocationsOswald Buddenhagen2016-06-281-1/+1
| | | | | | | | | | | | | | | qmake tries to use pkg-config when the config.test contains PKG_CONFIG, which will of course fail without the sysrooted env vars. and unlike in the old configure, these don't become automatically available by virtue of the script simply exporting them. longer-term, the test programs shouldn't mention pkg-config deps explicitly, as these are redundant with what is specified in the JSON file. relevant changes are already pending. Task-number: QTBUG-54403 Change-Id: Ie9d3bbb2e4febffde5fd122d7d0a8b70b8679fcc Reviewed-by: Liang Qi <liang.qi@qt.io>
* beautify generated spacingOswald Buddenhagen2016-06-281-3/+3
| | | | | | | | don't have extra spaces in the pkg-config calls when no environment variables are injected. Change-Id: Ieb14f775b2a04726e8f62114b69d9be7fa662eb0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* use globally available constantsOswald Buddenhagen2016-06-281-9/+2
| | | | | | | configure_base.prf gained them in a bugfix in 5.6. Change-Id: I7763b3dcdfbcc6cfb0392ddc4b6556f926395111 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Let qmake do most of the work of configuring QtLars Knoll2016-06-221-0/+1170
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>