diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 20:19:42 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 20:19:42 (GMT) |
commit | 30e55019f3ddf9d0df82df68c6324c96904fdc3a (patch) | |
tree | 74ba0dcd8d2bb3dc6507def69d3e2e3323da9a22 /configure | |
parent | b22e564844fdba82ddea665c55d0498a4caa1b14 (diff) | |
parent | f6451df12e9aab5e0134748bc2fae620fd12ec47 (diff) | |
download | Qt-30e55019f3ddf9d0df82df68c6324c96904fdc3a.zip Qt-30e55019f3ddf9d0df82df68c6324c96904fdc3a.tar.gz Qt-30e55019f3ddf9d0df82df68c6324c96904fdc3a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed configure on Solaris.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8438,7 +8438,7 @@ for file in .projects .projects.3; do *winmain/winmain.pro) [ "$XPLATFORM_MINGW" = "yes" ] || continue SPEC=$XQMAKESPEC ;; - *s60main/s60main.pro) if [ -z "`echo "$XPLATFORM" | grep "symbian" >/dev/null`"]; then + *s60main/s60main.pro) if [ -z "`echo "$XPLATFORM" | grep "symbian" >/dev/null`" ]; then continue fi;; *examples/activeqt/*) continue ;; |