From f22644c5fa8ddb7442a8dc89e29775544576d060 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 23 Oct 2020 10:19:17 +0200
Subject: [PATCH] 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>
---
 qmake/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

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