From ab4cc83d5249ea0baed66ef86bff3c29c36e8c7d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 11 Dec 2017 14:09:04 +0100
Subject: qmake: ignore QT if we have failed requires()

otherwise the project would need to clear QT despite using
qtHaveModule() in requires() (or REQUIRES=).

Task-number: QTBUG-65106
Change-Id: I568202214c8eafcdbe2d0e253b18f0e171293aff
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/qt.prf | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 3ccbbe7061..b57afcf72d 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -1,3 +1,7 @@
+# This avoids spurious errors when a project is explicitly disabled
+# due to required Qt modules being missing.
+!isEmpty(QMAKE_FAILED_REQUIREMENTS): return()
+
 CONFIG *= thread
 
 #handle defines
-- 
cgit v1.2.3