summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2009-11-04 15:39:17 +0100
committerDaniel Molkentin <daniel.molkentin@nokia.com>2009-11-04 15:43:14 +0100
commit05eeb454e0fcc83db330ee7df33a800a6998fc30 (patch)
tree78ad9932a62d3fb5d442f083a034a67d01913e01
parent7905101fb5ef18c776be515b9287356b1efc5ceb (diff)
eval: add key for the installer to grep for.
Reviewed-By: con
-rwxr-xr-xconfigure2
-rwxr-xr-xconfigure.exebin1171968 -> 1172480 bytes
-rw-r--r--tools/configure/configureapp.cpp2
3 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 9c3e417b3d..611f4bfad2 100755
--- a/configure
+++ b/configure
@@ -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
index 7c11feca25..13d0673fd4 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index e2b7d58103..95f271defd 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();