1 files changed, 18 insertions, 2 deletions
diff --git a/configure b/configure
index 4addf22896..03421dfc4c 100755
--- a/configure
+++ b/configure
@@ -762,6 +762,7 @@ QPA_PLATFORM_GUARD=yes
 CFG_CXX11=auto
 CFG_DIRECTWRITE=no
 CFG_WERROR=auto
+CFG_HEADERSCLEAN=auto
 CFG_QREAL=double
 OPT_MAC_SDK=
 COMMERCIAL_USER=ask
@@ -2240,6 +2241,13 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
+    headersclean)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_HEADERSCLEAN="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
     xkb-config-root)
         CFG_XKB_CONFIG_ROOT="$VAL"
         ;;
@@ -6712,8 +6720,16 @@ if [ "$CFG_DEV" = "yes" ]; then
     if [ "$CFG_WERROR" != "no" ]; then
         QMAKE_CONFIG="$QMAKE_CONFIG warnings_are_errors"
     fi
-elif [ "$CFG_WERROR" = "yes" ]; then
-    QMAKE_CONFIG="$QMAKE_CONFIG warnings_are_errors"
+    if [ "$CFG_HEADERSCLEAN" != "no" ]; then
+        QMAKE_CONFIG="$QMAKE_CONFIG headersclean"
+    fi
+else
+    if [ "$CFG_WERROR" = "yes" ]; then
+        QMAKE_CONFIG="$QMAKE_CONFIG warnings_are_errors"
+    fi
+    if [ "$CFG_HEADERSCLEAN" = "yes" ]; then
+        QMAKE_CONFIG="$QMAKE_CONFIG headersclean"
+    fi
 fi
 
 cat >>"$QTCONFIG.tmp" <<EOF