Merge remote branch 'qt-official/4.6' into 4.6

1 files changed, 1 insertions, 0 deletions

diff --git a/configure b/configure
index a8d9147a54..aab520ecd0 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";