From 5236e08cd4ce66184a20172dc71dea084caf0023 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 18 May 2017 18:07:39 +0200
Subject: make -skip work with configure -redo

the handling of -skip happens outside the usual argument handling, so we
need to handle -redo manually as well.

Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 qt.pro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'qt.pro')

diff --git a/qt.pro b/qt.pro
index 373b60c9..fad0bcf7 100644
--- a/qt.pro
+++ b/qt.pro
@@ -28,6 +28,8 @@ QT_SKIP_MODULES =
 
 # This is a bit hacky, but a proper implementation is not worth it.
 args = $$QMAKE_EXTRA_ARGS
+contains(args, -redo): \
+    args += $$cat($$OUT_PWD/config.opt, lines)
 for (ever) {
     isEmpty(args): break()
     a = $$take_first(args)
-- 
cgit v1.2.3