diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 19:16:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 19:16:08 (GMT) |
| commit | 178a4e12da0601ecc662851e5bf7f124932e1a12 (patch) | |
| tree | 6476132d916fef9e612cff16f00fea546ee7d761 /configure | |
| parent | 2aa8526f05c9e3b2b1ee45bf0653600640aa622e (diff) | |
| parent | 38e9c2224c3c0e83d42f3a7d6e525172341bbbf6 (diff) | |
| download | Qt-178a4e12da0601ecc662851e5bf7f124932e1a12.zip Qt-178a4e12da0601ecc662851e5bf7f124932e1a12.tar.gz Qt-178a4e12da0601ecc662851e5bf7f124932e1a12.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Added default countries for Mongolian and Nepali.
Updated tst_qlocale autotest.
Updated the 4.7.0 change log with my changes.
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
doc: Fixed many broken links.
doc: Fixed many broken links.
doc: Fixed many broken links.
qdoc: Set back to 3 cols for class list; we have a scrollbar now.
Fix build on Mac OS X and Windows.
Remove obsolete and broken qvfb skins.
Only setup ICD test data when ICD is enabled.
Doc: Fixed two diagrams and finally committed images for them.
Make sure cursorPositionChanged is emitted when doing undo/redo
Some more 4.7.0 changes
Fix cosmetic issue in designer filter edits
Doc: Adding support for IE 6, 7 and 8
doc: Updated the widgets tutorial to work without page links.
My 4.7.0 changes
Added support for es_419 locale.
Added Korean and Nynorsk locales support on Symbian.
...
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7482,7 +7482,7 @@ fi [ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" [ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO" [ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN" -[ "$CFG_ICD" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD" +[ "$CFG_ICD" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD" # sort QCONFIG_FLAGS for neatness if we can [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq` |