AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make "qmake -qtconf my-qt.conf -install ..." possible

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-10-23 10:19:17 +02:00
parent 661b586a69
commit f22644c5fa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/main.cpp
View File

@ -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);