diff options
author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-11-04 14:39:17 (GMT) |
---|---|---|
committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-11-04 14:43:14 (GMT) |
commit | 05eeb454e0fcc83db330ee7df33a800a6998fc30 (patch) | |
tree | 78ad9932a62d3fb5d442f083a034a67d01913e01 | |
parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
download | Qt-05eeb454e0fcc83db330ee7df33a800a6998fc30.zip Qt-05eeb454e0fcc83db330ee7df33a800a6998fc30.tar.gz Qt-05eeb454e0fcc83db330ee7df33a800a6998fc30.tar.bz2 |
eval: add key for the installer to grep for.
Reviewed-By: con
-rwxr-xr-x | configure | 2 | ||||
-rwxr-xr-x | configure.exe | bin | 1171968 -> 1172480 bytes | |||
-rw-r--r-- | tools/configure/configureapp.cpp | 2 |
3 files changed, 2 insertions, 2 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 diff --git a/configure.exe b/configure.exe Binary files differindex 7c11fec..13d0673 100755 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e2b7d58..95f271d 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3103,7 +3103,7 @@ void Configure::generateConfigfiles() if (tmpFile3.open()) { tmpStream.setDevice(&tmpFile3); tmpStream << "/* Evaluation license key */" << endl - << "static const char qt_eval_key_data [512 + 12] = \"" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; + << "static const char qt_eval_key_data [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; tmpStream.flush(); tmpFile3.flush(); |