diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 10:19:17 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 21:11:50 +0200 |
| commit | f22644c5fa8ddb7442a8dc89e29775544576d060 (patch) | |
| tree | 36f6771f9ff2690a8a193348148a75fe9cab868f /qmake | |
| parent | 661b586a69740bd9a1791622f8b238d290ebe00d (diff) | |
Make "qmake -qtconf my-qt.conf -install ..." possible
Detect the case where the first argument is -qtconf <file> and ignore
that for the -install argument.
Task-number: QTBUG-87801
Change-Id: If6822ee3ebef99de645aee8d110ebdcb13fb2da2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index b4ee8a75cf..37b5ee1c93 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -457,6 +457,8 @@ int runQMake(int argc, char **argv) setvbuf(stdout, (char *)NULL, _IONBF, 0); // Workaround for inferior/missing command line tools on Windows: make our own! + if (argc >= 4 && !strcmp(argv[1], "-qtconf") && !strcmp(argv[3], "-install")) + return doInstall(argc - 4, argv + 4); if (argc >= 2 && !strcmp(argv[1], "-install")) return doInstall(argc - 2, argv + 2); |