diff options
| author | hjk <qtc-committer@nokia.com> | 2009-04-02 14:42:36 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-04-02 14:50:11 (GMT) |
| commit | db4040f7bf1e36b9568e7a99dc090acf03b0ddd0 (patch) | |
| tree | 46fa54e8eeb2c43f3f80e78dd934c97398bf216c /configure | |
| parent | cfa31244eb9d16214360626723253d6a363a8d48 (diff) | |
| download | Qt-db4040f7bf1e36b9568e7a99dc090acf03b0ddd0.zip Qt-db4040f7bf1e36b9568e7a99dc090acf03b0ddd0.tar.gz Qt-db4040f7bf1e36b9568e7a99dc090acf03b0ddd0.tar.bz2 | |
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |