summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jkobus@trolltech.com>2009-04-15 13:15:25 (GMT)
committerJarek Kobus <jkobus@trolltech.com>2009-04-15 13:15:25 (GMT)
commitcca58cff45ea248ab9c65fd8ce088433af1c0fe0 (patch)
tree0c3b6f9f9bc0904e6d4338619acbf31d2c75c38c
parent34ae1f3021147062e669747c4023051ed38c72aa (diff)
downloadQt-cca58cff45ea248ab9c65fd8ce088433af1c0fe0.zip
Qt-cca58cff45ea248ab9c65fd8ce088433af1c0fe0.tar.gz
Qt-cca58cff45ea248ab9c65fd8ce088433af1c0fe0.tar.bz2
Make the configured namespace part of QT_BUILD_KEY_COMPAT too.
The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin() Task: 250185 Reviewed-by: dt <qtc-committer@nokia.com> BT: yes
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 730c84a..a3a7b2d 100755
--- a/configure
+++ b/configure
@@ -6213,6 +6213,9 @@ QT_BUILD_KEY_COMPAT=
if [ "$QT_CROSS_COMPILE" = "no" ]; then
# previous versions of Qt used a build key built from the uname
QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS"
+ if [ -n "$QT_NAMESPACE" ]; then
+ QT_BUILD_KEY_COMPAT="$QT_BUILD_KEY_COMPAT $QT_NAMESPACE"
+ fi
fi
# strip out leading/trailing/extra whitespace
QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"`