From 6089888d1d6c2b6ab6b8b788ccec951b58292cd8 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 20 Oct 2020 08:34:01 +0200
Subject: Make configure -qmake actually work

We need to ignore this option in qt_configure.prf.
This amends 077ea0c63326013ff6d9c85e59b322ffc2ec278c.

Task-number: QTBUG-87049
Change-Id: If05b16a95d0830df9ca63961576981f8983820cc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 mkspecs/features/qt_configure.prf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mkspecs/features/qt_configure.prf')

diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 93448acb91..4c18dbf953 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -340,6 +340,11 @@ defineTest(qtConfParseCommandLine) {
             type = boolean
         }
 
+        # Skip the -qmake option.
+        isEmpty(type):contains(opt, "qmake") {
+            next()
+        }
+
         isEmpty(type):contains(opt, "skip") {
             isEmpty(skipOptionWarningAdded) {
                 qtConfAddWarning("Command line option -skip is only effective in top-level builds.")
-- 
cgit v1.2.3