From 661b586a69740bd9a1791622f8b238d290ebe00d Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 23 Oct 2020 10:37:24 +0200
Subject: [PATCH] Make "qmake -qtconf my-qt.conf -query" possible

It's now possible to put the -qtconf argument in front of the -query
argument (and others).

Fixes: QTBUG-85136
Change-Id: I74b78f084acf264ef637ed2f6cb63b655b176056
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 qmake/option.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qmake/option.cpp b/qmake/option.cpp
index df8a5742a1c..9c435efb896 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -420,6 +420,11 @@ Option::init(int argc, char **argv)
                 Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY;
             } else if (opt == "-makefile") {
                 Option::qmake_mode = Option::QMAKE_GENERATE_MAKEFILE;
+            } else if (opt == "-qtconf") {
+                // Move the argument following "-qtconf <file>" in front and check again.
+                if (args.length() >= 3)
+                    args.prepend(args.takeAt(2));
+                continue;
             } else {
                 break;
             }