summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-06 12:04:18 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-11-06 13:07:40 (GMT)
commit048989dedeba6a719760bbc96ebb99a44669d54d (patch)
treeba5f8b12cc991ef3a4980844c569504bb313bf6d
parent8df2c631632694328c84c667a4022b1bcaac3b32 (diff)
downloadQt-048989dedeba6a719760bbc96ebb99a44669d54d.zip
Qt-048989dedeba6a719760bbc96ebb99a44669d54d.tar.gz
Qt-048989dedeba6a719760bbc96ebb99a44669d54d.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
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index a8d9147..aab520e 100755
--- a/configure
+++ b/configure
@@ -4195,6 +4195,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";