move license check to qmake-based configure system

this also removes the need for passing pre-processed options via
configure.cfg, so get rid of that.

a somewhat unfortunate side effect is that the android-style-assets
feature had to move back to the top level, as the licensing options
depend on it.

Started-by: Lars Knoll <lars.knoll@qt.io>
Change-Id: Id4d1e0ba18b3e3104400293b8f0c7f2f65e68dea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 0 insertions, 7 deletions

diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 91a99c16c2..f6c2722529 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -45,13 +45,6 @@ int runConfigure( int argc, char** argv )
     if (!app.isOk())
         return 3;
 
-    // Read license now, and exit if it doesn't pass.
-    // This lets the user see the command-line options of configure
-    // without having to load and parse the license file.
-    app.readLicense();
-    if (!app.isOk())
-        return 3;
-
     // Source file with path settings. Needed by qmake.
     app.generateQConfigCpp();