From 1d87017c4681c9d5da14d613b5b84d25620642fe Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Thu, 3 Jun 2010 11:28:55 +0200
Subject: Fix compilation: disable -no-feature-* for bootstrapped moc isn't
 compiled when qt is configured if -no-feature-datestring

Merge-request: 2347
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure b/configure
index 0111f51..0db2236 100755
--- a/configure
+++ b/configure
@@ -7509,6 +7509,10 @@ then
 fi
 
 if [ -n "$QCONFIG_FLAGS" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#ifndef QT_BOOTSTRAPPED
+
+EOF
     for cfg in $QCONFIG_FLAGS; do
         cfgd=`echo $cfg | sed 's/=.*$//'` # trim pushed 'Foo=Bar' defines
         cfg=`echo $cfg | sed 's/=/ /'`    # turn first '=' into a space
@@ -7541,6 +7545,10 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
 EOF
         fi
     done
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#endif // QT_BOOTSTRAPPED
+
+EOF
 fi
 
 if [ "$CFG_REDUCE_EXPORTS" = "yes" ]; then
-- 
cgit v0.12