diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 14:15:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 14:15:16 (GMT) |
| commit | bdeb4b458320ddefc9bcd19620bed7dc242b4d5c (patch) | |
| tree | 51b995db1f4fec658adf9f644ce7590501d627ad /tools | |
| parent | caca740ea1219227008c303b5f2fac24af5a62a0 (diff) | |
| parent | fe8276e812c5fdc690715d7e36a6b6d70cba7d33 (diff) | |
| download | Qt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.zip Qt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.tar.gz Qt-bdeb4b458320ddefc9bcd19620bed7dc242b4d5c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Prevent compilers optimizing eval timebomb code out of existence.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3808c4e..5966fd2 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3331,7 +3331,7 @@ void Configure::generateConfigfiles() if (tmpFile3.open()) { tmpStream.setDevice(&tmpFile3); tmpStream << "/* Evaluation license key */" << endl - << "static const char qt_eval_key_data [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; + << "static const volatile char qt_eval_key_data [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl; tmpStream.flush(); tmpFile3.flush(); |