diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:41:07 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 13:41:07 (GMT) |
| commit | aa0dfd5befb7c00ceb23a67d7f1d49e165756d28 (patch) | |
| tree | 520b6c2a2f3724bce25fb5f88bad19e244ffb5a4 /configure | |
| parent | 654cbdb901386b2a8e168cd52446abdddec1aa28 (diff) | |
| parent | 5491ab9c921c8e7b89e335c7d09219153ae1d21a (diff) | |
| download | Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.zip Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.tar.gz Qt-aa0dfd5befb7c00ceb23a67d7f1d49e165756d28.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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"; |