253 Commits

Author	SHA1	Message	Date
Allan Sandfeld Jensen	29ac40d6cd	Correct framework config options to remain as they used to ... Commit 90eee08b3e changed how framework config was defined, subtlely breaking Qt framework builds. Task-number: QTBUG-54361 Change-Id: Ie7670d900d9eb4c2adb52ca1cd0f60f22acf8b81 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2016-06-27 14:39:22 +00:00
Lars Knoll	921df719dc	Correctly set simulator_and_device in ios builds ... A small logic error that sneaked in during the porting of configure. We actually want simulator_and_device to be set if input.sdk is empty, not the other way round. Change-Id: I8f729fbc48617618f981c70887bd4400e0b2a0c3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2016-06-24 12:29:07 +00:00
Lars Knoll	90eee08b3e	Let qmake do most of the work of configuring Qt ... 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>	2016-06-22 14:19:35 +00:00