diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-15 13:15:25 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-15 22:04:22 (GMT) |
| commit | 4282da271dab554c020f8b24e6679fea69d8e815 (patch) | |
| tree | d650d67b4ffe206f97bd0750452c2bf8b38ad76c | |
| parent | 793310766ff5db8739136847f4bc896999eae9e9 (diff) | |
| download | Qt-4282da271dab554c020f8b24e6679fea69d8e815.zip Qt-4282da271dab554c020f8b24e6679fea69d8e815.tar.gz Qt-4282da271dab554c020f8b24e6679fea69d8e815.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
(cherry picked from commit cca58cff45ea248ab9c65fd8ce088433af1c0fe0)
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -6210,6 +6210,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, *$,,"` |