diff options
| author | axis <qt-info@nokia.com> | 2010-07-27 09:09:43 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-27 11:21:15 (GMT) |
| commit | 71df0ad5c02365e3baf8f6996d4b258f5da52a2f (patch) | |
| tree | 6d0a2ce29b5d47b1ce47a6fc4d65aebf0207d438 /configure | |
| parent | 1a62f2ae0624293341bef3fad88c5926cb5b3037 (diff) | |
| download | Qt-71df0ad5c02365e3baf8f6996d4b258f5da52a2f.zip Qt-71df0ad5c02365e3baf8f6996d4b258f5da52a2f.tar.gz Qt-71df0ad5c02365e3baf8f6996d4b258f5da52a2f.tar.bz2 | |
Fixed plugin build key for Symbian builds under Linux.
Task: QTBUG-8962
RevBy: Jason Barron
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -6929,6 +6929,8 @@ fi # turn off exceptions for the compilers that support it if [ "$PLATFORM_QWS" = "yes" ]; then COMPILER=`echo $XPLATFORM | cut -f 3- -d-` +elif [ "$XPLATFORM" != "$PLATFORM" ]; then + COMPILER=`echo $XPLATFORM | cut -f 2- -d-` else COMPILER=`echo $PLATFORM | cut -f 2- -d-` fi @@ -7407,9 +7409,17 @@ rm -f .options BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS" # extract the operating system from the XPLATFORM TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-` +case "$XPLATFORM" in +symbian*) + QT_BUILD_KEY_SYSTEM_PART="Symbian" + ;; +*) + QT_BUILD_KEY_SYSTEM_PART="$CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER" + ;; +esac # when cross-compiling, don't include build-host information (build key is target specific) -QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" +QT_BUILD_KEY="$CFG_USER_BUILD_KEY $QT_BUILD_KEY_SYSTEM_PART $BUILD_OPTIONS" if [ -n "$QT_NAMESPACE" ]; then QT_BUILD_KEY="$QT_BUILD_KEY $QT_NAMESPACE" fi |