diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 12:43:10 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 12:43:10 (GMT) |
commit | 5491ab9c921c8e7b89e335c7d09219153ae1d21a (patch) | |
tree | dbf16c74a22467e8e44c820e50a44a401cb7fb52 /configure | |
parent | 26bdefae2a59d9bd022d32f1b33b320c619c7e81 (diff) | |
parent | 840bfa76daa490a53064c22a5ca93e7583d866bc (diff) | |
download | Qt-5491ab9c921c8e7b89e335c7d09219153ae1d21a.zip Qt-5491ab9c921c8e7b89e335c7d09219153ae1d21a.tar.gz Qt-5491ab9c921c8e7b89e335c7d09219153ae1d21a.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4183,6 +4183,7 @@ elif echo "$D_FLAGS" | grep QT_EVAL >/dev/null 2>&1; then fi if [ -n "$EVALKEY" ]; then + rm -f "$outpath/src/corelib/global/qconfig_eval.cpp" cat > "$outpath/src/corelib/global/qconfig_eval.cpp" <<EOF /* Evaluation license key */ static const char qt_eval_key_data [512 + 12] = "$EVALKEY"; |