diff options
| author | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-02-23 09:00:12 (GMT) |
|---|---|---|
| committer | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-02-23 09:01:37 (GMT) |
| commit | b4d55d5288ddae325046f62f65cbf667283b3859 (patch) | |
| tree | b020750adb616e7cc8b71cd14c5d762c327f5764 /src/corelib/tools | |
| parent | 48161233af2a6071bc0ba99e546da98f705b8281 (diff) | |
| download | Qt-b4d55d5288ddae325046f62f65cbf667283b3859.zip Qt-b4d55d5288ddae325046f62f65cbf667283b3859.tar.gz Qt-b4d55d5288ddae325046f62f65cbf667283b3859.tar.bz2 | |
Fix compile error in QEasingCurve
Reviewed-by: akennedy
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qeasingcurve.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 6b26907..89edb2d 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -861,7 +861,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item) QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing) { stream << easing.d_ptr->type; - stream << intptr_t(easing.d_ptr->func); + stream << quint64(intptr_t(easing.d_ptr->func)); bool hasConfig = easing.d_ptr->config; stream << hasConfig; @@ -891,9 +891,9 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing) type = static_cast<QEasingCurve::Type>(int_type); easing.setType(type); - intptr_t ptr_func; + quint64 ptr_func; stream >> ptr_func; - easing.d_ptr->func = QEasingCurve::EasingFunction(ptr_func); + easing.d_ptr->func = QEasingCurve::EasingFunction(intptr_t(ptr_func)); bool hasConfig; stream >> hasConfig; |