summaryrefslogtreecommitdiffstats
path: root/tools/configure/main.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-08-25 15:45:44 +0200
committerLars Knoll <lars.knoll@qt.io>2016-09-10 14:04:01 +0000
commit60e5a1c8effd4099f7b1414107b5cbb67c266210 (patch)
tree6fbd85b8329c9fe67af1de55bbb10e6c327717d5 /tools/configure/main.cpp
parent137e690ac76b6db59592f9a8f0b55e445d6f5ab1 (diff)
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new configuration system. This requires a hierarchy of configuration files, both for handling multiple repositories and for individual modules inside the same repository. When configuring, they all need to get loaded first, as command line processing needs to know about all possible command line options. When the command line has been processed, the individual configuration files need to get processed one after the other and independently from each other. Configure is now automatically invoked when building the a project tree's "root" project; this works with both modular and top-level builds of Qt (the latter with an according change in the super repo). As an immediate consequence, the -skip option moves to the super repo with a different implementation, as configuration is now done after the repo list is determined. The option belongs there anyway. This commit also adds an optional testDir entry to the json file. Like this, we can still have all configure tests in qtbase/config.tests and the configuration file in, e.g., corelib can reference those. The files section can now be left out as long as a 'module' entry is present, specifying the module name. The names of the files to generate can then be deduced from that name. We still need to be able to specify names directly for the global configuration files. qtConfig() now also queries features which are module-specific. As it is sometimes necessary to query the configuration of modules which should not be actually linked (and cannot in the case of subdirs projects), the new variable QT_FOR_CONFIG which allows specifying configuration-only dependencies is introduced. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools/configure/main.cpp')
-rw-r--r--tools/configure/main.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index ac521f42e4..91a99c16c2 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -80,10 +80,6 @@ int runConfigure( int argc, char** argv )
if (!app.isOk())
return 3;
- app.generateMakefiles();
- if( !app.isOk() )
- return 2;
-
return 0;
}