diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:42:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:42:27 (GMT) |
| commit | dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc (patch) | |
| tree | 05f9f9bc92322c9b42257c00ae2df14700fdd35f /configure | |
| parent | 79a7c969983eafeef67cce28724c3981cf3af1ea (diff) | |
| parent | e95e69f7d1209cceacdef0f26416b93c1d83e8e0 (diff) | |
| download | Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.zip Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.tar.gz Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -431,6 +431,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then ;; Z4M|R4M|Q4M) LicenseType="Evaluation" + QMakeVar add DEFINES QT_EVAL case $ProductCode in B) Edition="Evaluation" @@ -4068,12 +4069,17 @@ SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_I EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` +TODAY=`date +%Y-%m-%d` cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* License Info */ static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR"; static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR"; + +/* Installation date */ +static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY"; EOF + if [ ! -z "$QT_HOST_PREFIX" ]; then HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"` HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"` @@ -4155,6 +4161,22 @@ else fi # ----------------------------------------------------------------------------- +if [ "$LicenseType" = "Evaluation" ]; then + EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey=$LicenseKeyExt"` +elif echo "$D_FLAGS" | grep QT_EVAL >/dev/null 2>&1; then + EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey="` +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"; +EOF + chmod -w "$outpath/src/corelib/global/qconfig_eval.cpp" +fi + + +# ----------------------------------------------------------------------------- # build qmake # ----------------------------------------------------------------------------- |