summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-03-30 12:19:47 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2016-04-12 11:07:25 +0000
commit24ac2f35c1f2c117638a2c341ace2e9c957f0df7 (patch)
tree04086c884b81f69ffc842789f7720d4761332691
parent53412df398445651c1886b7acbed9d4e38a34b2f (diff)
Don't set config-[minimal|small|...] in qconfig.pri anymore
These values are artifacts from the past and not used anymore since Qt 3 times. Change-Id: Ide2a7b3bd000ec0bc280a5467549c1a974c019e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rwxr-xr-xconfigure30
1 files changed, 10 insertions, 20 deletions
diff --git a/configure b/configure
index a28f985376..bc1cd09251 100755
--- a/configure
+++ b/configure
@@ -3041,28 +3041,18 @@ fi
# update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
-case "$CFG_QCONFIG" in
-minimal|small|medium|large|full)
- # these are a sequence of increasing functionality
- for c in minimal small medium large full; do
- QT_CONFIG="$QT_CONFIG $c-config"
- [ "$CFG_QCONFIG" = $c ] && break
- done
- [ "$CFG_QCONFIG" = full ] && CFG_QCONFIG_PATH=
- ;;
-*)
- # not known to be sufficient for anything
+if [ "$CFG_QCONFIG" = full ]; then
+ CFG_QCONFIG_PATH=
+elif [ ! -f "$CFG_QCONFIG_PATH" ]; then
+ CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"`
if [ ! -f "$CFG_QCONFIG_PATH" ]; then
- CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"`
- if [ ! -f "$CFG_QCONFIG_PATH" ]; then
- echo >&2 "Error: configuration file not found:"
- echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
- echo >&2 " or"
- echo >&2 " $CFG_QCONFIG_PATH"
- exit 1
- fi
+ echo >&2 "Error: configuration file not found:"
+ echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h"
+ echo >&2 " or"
+ echo >&2 " $CFG_QCONFIG_PATH"
+ exit 1
fi
-esac
+fi
if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then
echo