summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-07-01 15:09:43 (GMT)
committeraxis <qt-info@nokia.com>2010-07-02 13:31:22 (GMT)
commitad82e439c735912d069a2cf456b04e3d10016e84 (patch)
treeff8f1fae53be3b5af6fab31e8d1bfe72b0860f32 /configure
parente4616afabbdccdbd6f53e5c96086bd4065af9227 (diff)
downloadQt-ad82e439c735912d069a2cf456b04e3d10016e84.zip
Qt-ad82e439c735912d069a2cf456b04e3d10016e84.tar.gz
Qt-ad82e439c735912d069a2cf456b04e3d10016e84.tar.bz2
Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
Task: QTBUG-11396 RevBy: Miikka Heikkinen
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure b/configure
index 4650229..01040e3 100755
--- a/configure
+++ b/configure
@@ -7627,6 +7627,13 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
EOF
fi
+if [ -n "$QT_LIBINFIX" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#define QT_LIBINFIX "$QT_LIBINFIX"
+
+EOF
+fi
+
# avoid unecessary rebuilds by copying only if qconfig.h has changed
if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
rm -f "$outpath/src/corelib/global/qconfig.h.new"