From 098c24344f208fcd53c4b8a9af62476108fc4b93 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Nov 2013 17:20:18 +0100 Subject: [PATCH] de-duplicate QT_DISABLED_FEATURES after resolving dependencies Change-Id: I1873c1e7c59af02b06566d0e47c020c609d49c9f Reviewed-by: Stephen Kelly Reviewed-by: Joerg Bornemann --- qtbase.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qtbase.pro b/qtbase.pro index 37a20738fd..8da34c5023 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -172,7 +172,8 @@ FEATURES_PRI = \ "$${LITERAL_HASH} Features disabled by configure:" \ "QT_DISABLED_FEATURES =$$lower($$join($$list($$replace(no_features, _, -)), " ", " "))" \ "$$escape_expand(\\n)$${LITERAL_HASH} Dependencies derived from /src/corelib/global/qfeatures.txt:" \ - $$FEATURES_PRI + $$FEATURES_PRI \ + "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)" write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.") #mkspecs