diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-06-03 09:28:55 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-06-03 09:29:10 (GMT) |
| commit | 1d87017c4681c9d5da14d613b5b84d25620642fe (patch) | |
| tree | e66302369a089ed536666646115f26240897da22 | |
| parent | cd003bfcf9a05967893099e8948ba3d8f281aa7d (diff) | |
| download | Qt-1d87017c4681c9d5da14d613b5b84d25620642fe.zip Qt-1d87017c4681c9d5da14d613b5b84d25620642fe.tar.gz Qt-1d87017c4681c9d5da14d613b5b84d25620642fe.tar.bz2 | |
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>
| -rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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 |