summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-27 12:17:21 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-27 14:35:31 +0200
commita2382f7f15ad25169db24cfd090e68d5bcb11e08 (patch)
tree95e208268b6b2e23edf91804fd4f41be379270da
parent104ee6921652d168884d6ae6faece9e4efc73024 (diff)
unset QT_MODULE_* after loading the module pris
abuses have been observed in the wild, so make sure these variables are not available. Change-Id: I502c3f5db7d341cf6a8bd2ec09e87f129da2fca6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
-rw-r--r--mkspecs/features/qt_config.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 07fd988fb5..305ff1cb81 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -24,6 +24,11 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
include($$mod)
}
}
+ unset(QT_MODULE_INCLUDE_BASE)
+ unset(QT_MODULE_LIB_BASE)
+ unset(QT_MODULE_PLUGIN_BASE)
+ unset(QT_MODULE_BIN_BASE)
+ unset(QT_MODULE_IMPORT_BASE)
}
load(qt_functions)