diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:27:59 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:27:59 (GMT) |
| commit | ede4591bee8f6e2572f681064de03a327dc66629 (patch) | |
| tree | af1f9890bfda8a9fbf09ea5717b252e471215dc5 | |
| parent | 7f7d4cdf01409283d32a6799c1f73663b8ec3ea1 (diff) | |
| parent | 40914841ea59d3c7a0c1d0baf5f82af23b79e63f (diff) | |
| download | Qt-ede4591bee8f6e2572f681064de03a327dc66629.zip Qt-ede4591bee8f6e2572f681064de03a327dc66629.tar.gz Qt-ede4591bee8f6e2572f681064de03a327dc66629.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
| -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] = "qt_qevalkey=$EVALKEY"; +static const char qt_eval_key_data [512 + 12] = "$EVALKEY"; EOF chmod -w "$outpath/src/corelib/global/qconfig_eval.cpp" fi |