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 /src | |
| 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 'src')
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index 78556c3..da76b74 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -90,14 +90,14 @@ static const char will_shutdown_now[] = static int qt_eval_is_supported() { - const char *const license_key = qt_eval_key_data + 12; + const volatile char *const license_key = qt_eval_key_data + 12; // fast fail if (!qt_eval_key_data[0] || !*license_key) return -1; // is this an unsupported evaluation? - const char* typecode = license_key; + const volatile char *typecode = license_key; int field = 2; for ( ; field && *typecode; ++typecode) if (*typecode == '-') |