diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-15 13:15:25 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-15 16:14:20 (GMT) |
| commit | e380893442fb5863bcd082de4785565d6f9e8414 (patch) | |
| tree | a0bb08372fc8640ccf842d929a524e7821e131ee /configure | |
| parent | b89a87ca0d14d882250688260b21fb1567273b34 (diff) | |
| download | Qt-e380893442fb5863bcd082de4785565d6f9e8414.zip Qt-e380893442fb5863bcd082de4785565d6f9e8414.tar.gz Qt-e380893442fb5863bcd082de4785565d6f9e8414.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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -6216,6 +6216,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, *$,,"` |