diff options
author | James McDonnell <jmcdonnell@qnx.com> | 2016-06-09 12:15:09 -0400 |
---|---|---|
committer | James McDonnell <jmcdonnell@qnx.com> | 2016-06-15 13:46:19 +0000 |
commit | b07736c0bc5507e663463ff8f3e3bbb905e1acc9 (patch) | |
tree | bf988f0962f00946a048875e256594a3306f7aae /src | |
parent | c2b7841843f05fe902e6a94aee2c3f33b169009e (diff) |
Correct a type mismatch in the QNX PPS code
It's a problem when building for 64-bit where the two types no longer
match.
Change-Id: I8c31915caf81a60d635c79816a3a2d5d36742ff9
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qppsobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qppsobject.cpp b/src/corelib/kernel/qppsobject.cpp index 76508f12c5..230b7dcae0 100644 --- a/src/corelib/kernel/qppsobject.cpp +++ b/src/corelib/kernel/qppsobject.cpp @@ -169,7 +169,7 @@ QPpsAttribute QPpsObjectPrivate::decodeNumber(pps_decoder_t *decoder) // In order to support more number types, we have to do something stupid because the PPS // library won't let us work any other way. Basically, we have to probe the encoded type in // order to try to get exactly what we want. - long long llValue; + int64_t llValue; double dValue; int iValue; QPpsAttribute::Flags flags; @@ -187,7 +187,7 @@ QPpsAttribute QPpsObjectPrivate::decodeNumber(pps_decoder_t *decoder) return QPpsAttribute(); } flags = readFlags(decoder); - return QPpsAttributePrivate::createPpsAttribute(llValue, flags); + return QPpsAttributePrivate::createPpsAttribute(static_cast<long long>(llValue), flags); default: qWarning() << "QPpsObjectPrivate::decodeNumber: pps_decoder_get_int failed"; return QPpsAttribute(); |