diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 09:20:41 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 09:20:41 (GMT) |
commit | f6451df12e9aab5e0134748bc2fae620fd12ec47 (patch) | |
tree | fc37e3c0b683a3152ba3a1c4dce9b62a7f64c6b5 | |
parent | 02d3230a6b569e848bdae30ac2184613aade64ff (diff) | |
parent | 71166652ef13edb9ca19cf0f30a59112e158c72d (diff) | |
download | Qt-f6451df12e9aab5e0134748bc2fae620fd12ec47.zip Qt-f6451df12e9aab5e0134748bc2fae620fd12ec47.tar.gz Qt-f6451df12e9aab5e0134748bc2fae620fd12ec47.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.
-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 ;; |