diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 03:59:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 03:59:01 (GMT) |
| commit | e4c49c5344058aaa033a9928e96205c767b8e07d (patch) | |
| tree | b14f2bf71ee4bd58dc4e3ab547944e84358f4668 /configure | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | 3d745d7ded2ed8d52a8c6d9f7113bd6a61e13647 (diff) | |
| download | Qt-e4c49c5344058aaa033a9928e96205c767b8e07d.zip Qt-e4c49c5344058aaa033a9928e96205c767b8e07d.tar.gz Qt-e4c49c5344058aaa033a9928e96205c767b8e07d.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:
add static QChar::is(High|Low)Surrogate methods
Increase tooltip margin for cleanlooks+gtk
Fixes a crash in QGestureManager when unregistering recognizers.
Propagate LocaleChange event from application to widgets.
Support updating system locale data on Symbian
QMap: make sure we never access forward and backward through typed Node structs
Don't quote $COMPILER because it may contain flags
Unix configure: fix sed pattern extracting C and C++ flags from mkspec
qdoc: Added more API topics. Are these important?
Prevent accelerators from firing on X11 and QWS during a drag
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3097,8 +3097,8 @@ fi # auto-detect support for separate debug info in objcopy if [ "$CFG_SEPARATE_DEBUG_INFO" != "no" ] && [ "$CFG_SHARED" = "yes" ]; then - TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_].*=%%p' | tr '\n' ' '` - TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_].*=%%p' | tr '\n' ' '` + TEST_COMPILER_CFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CFLAGS[^_=]*[+*]*=%%p' | tr '\n' ' '` + TEST_COMPILER_CXXFLAGS=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%QMAKE_CXXFLAGS[^_=]*[+*]*=%%p' | tr '\n' ' '` TEST_OBJCOPY=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_OBJCOPY" | sed "s%.* *= *\(.*\)$%\1%" | tail -1` COMPILER_WITH_FLAGS="$TEST_COMPILER $TEST_COMPILER_CXXFLAGS" COMPILER_WITH_FLAGS=`echo "$COMPILER_WITH_FLAGS" | sed -e "s%\\$\\$QMAKE_CFLAGS%$TEST_COMPILER_CFLAGS%g"` |