From db4040f7bf1e36b9568e7a99dc090acf03b0ddd0 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 2 Apr 2009 16:42:36 +0200 Subject: make the configured namespace part of QT_BUILD_KEY The eclipse integration is namespaced, but it pulls in system plugins like the oxygen style. This breaks as the (non-namespaced) style plugin does not find a suitable QApplication instantiated (only a namespace one is there) Reviewed-by: thiago Task-number: 250185 --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index f0b7f90..f79b1e2 100755 --- a/configure +++ b/configure @@ -6177,6 +6177,9 @@ TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-` # 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" +if [ -n "$QT_NAMESPACE" ]; then + QT_BUILD_KEY="$QT_BUILD_KEY $QT_NAMESPACE" +fi MAC_NEED_TWO_BUILD_KEYS="no" if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then QT_BUILD_KEY_CARBON=$QT_BUILD_KEY -- cgit v0.12