diff options
| author | axis <qt-info@nokia.com> | 2010-07-27 09:09:43 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-28 06:14:52 (GMT) |
| commit | 1772b199718fd3e113175ffbb5eddfa5fd51656b (patch) | |
| tree | 44cb1125825a11dadba4064ee73854d8705be748 | |
| parent | e1c2cd233b961bbf4b90437bebce60e29fb20323 (diff) | |
| download | Qt-1772b199718fd3e113175ffbb5eddfa5fd51656b.zip Qt-1772b199718fd3e113175ffbb5eddfa5fd51656b.tar.gz Qt-1772b199718fd3e113175ffbb5eddfa5fd51656b.tar.bz2 | |
Fixed plugin build key for Symbian builds under Linux.
Task: QTBUG-8962
RevBy: Jason Barron
(cherry picked from commit 71df0ad5c02365e3baf8f6996d4b258f5da52a2f)
| -rwxr-xr-x | configure | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -6775,6 +6775,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 @@ -7246,9 +7248,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 |