diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:12:52 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:13:16 +0100 |
| commit | a3cf9d99b303baaca0d1b0fbaa1b1923c06d18cc (patch) | |
| tree | f6343d37558880cd0e93ae9229a5cdf0ac16dc56 /src/nfc | |
| parent | 2c1d2691e853812a06d435ffcf61e17f82edb224 (diff) | |
| parent | aea5e3971986b4beba395985108fcad2c0c98c37 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into dev
Change-Id: I97b51eb3fe2040711c00da67bbb1954fc2e65c1f
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qnearfieldtarget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index 0d57e5f3..1cb8d30c 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.cpp @@ -135,7 +135,7 @@ static const quint16 crc_tbl[16] = { */ quint16 qNfcChecksum(const char *data, uint len) { - register quint16 crc = 0x6363; + quint16 crc = 0x6363; uchar c; const uchar *p = reinterpret_cast<const uchar *>(data); while (len--) { |