summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-06 12:04:18 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-06 12:04:18 (GMT)
commit33aeddff84e449404787f4be1b53d0fb52060ffb (patch)
tree573281e34a0e4f460d7301644a8a17cba7962acb /configure
parent0625bb69685d768891fe882b788d56285eb9a1ee (diff)
downloadQt-33aeddff84e449404787f4be1b53d0fb52060ffb.zip
Qt-33aeddff84e449404787f4be1b53d0fb52060ffb.tar.gz
Qt-33aeddff84e449404787f4be1b53d0fb52060ffb.tar.bz2
Fix error when configuring on Unix using an evaluation license.
If you run configure on Unix more than once using an eval license (or -DQT_EVAL), configure outputs an error and fails to overwrite src/corelib/global/qconfig_eval.cpp. This is corrected simply by removing any existing instance of the file before re-creating it. Reviewed-by: Trust Me
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 9c3e417..208bb6b 100755
--- a/configure
+++ b/configure
@@ -4183,6 +4183,7 @@ elif echo "$D_FLAGS" | grep QT_EVAL >/dev/null 2>&1; then
fi
if [ -n "$EVALKEY" ]; then
+ rm -f "$outpath/src/corelib/global/qconfig_eval.cpp"
cat > "$outpath/src/corelib/global/qconfig_eval.cpp" <<EOF
/* Evaluation license key */
static const char qt_eval_key_data [512 + 12] = "$EVALKEY";