diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-11-25 05:34:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-11-25 05:34:16 (GMT) |
| commit | 444d931b7ca2d8772054d795e0573384342b58dd (patch) | |
| tree | 0587d65ad5b8c7e2c80dfac0051174b9248e1e03 /src/corelib/kernel/qtcore_eval.cpp | |
| parent | 852f4811453cb0b082748f2fcefac5898e603ab0 (diff) | |
| parent | 9e353ea7a1fedd020d39e83322286931f536dc16 (diff) | |
| download | Qt-444d931b7ca2d8772054d795e0573384342b58dd.zip Qt-444d931b7ca2d8772054d795e0573384342b58dd.tar.gz Qt-444d931b7ca2d8772054d795e0573384342b58dd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/kernel/qtcore_eval.cpp')
| -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 == '-') |