diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-04 15:45:57 (GMT) |
| commit | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (patch) | |
| tree | ae1d621e9933d88e22f03e28dfea671a3a272ab1 /configure | |
| parent | 4e5a1a77677540422cc69ec5c2b1341ca4b318f9 (diff) | |
| parent | 05eeb454e0fcc83db330ee7df33a800a6998fc30 (diff) | |
| download | Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.zip Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.gz Qt-56b8d24c337d30c6bcdda101fbc664c4fd6d642d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4185,7 +4185,7 @@ fi if [ -n "$EVALKEY" ]; then cat > "$outpath/src/corelib/global/qconfig_eval.cpp" <<EOF /* Evaluation license key */ -static const char qt_eval_key_data [512 + 12] = "$EVALKEY"; +static const char qt_eval_key_data [512 + 12] = "qt_qevalkey=$EVALKEY"; EOF chmod -w "$outpath/src/corelib/global/qconfig_eval.cpp" fi |