diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-18 18:17:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-08 12:40:53 +0000 |
| commit | e2978d6097be2313e49c57ec14618033cbfa7414 (patch) | |
| tree | b9ccc2e78f1869ed0d94c6569649c7de1488719b /tools/configure/environment.h | |
| parent | f882d2f443a8950a2f784fa91b3ff10a645577f7 (diff) | |
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>
Diffstat (limited to 'tools/configure/environment.h')
| -rw-r--r-- | tools/configure/environment.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h index aa8e7fd8bc..8415fa10a6 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -52,7 +52,6 @@ public: static QString detectQMakeSpec(); static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv); - static QString execute(const QString &command, int *returnCode = 0); private: static Compiler detectedCompiler; |