summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:59:28 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-25 14:59:28 (GMT)
commit11e9386c5704fe1a008370e032e6f114a458a473 (patch)
tree025af2d8922c86676078ac7284247bb5b4828e08 /src/corelib
parent8d720825279c8bf06d28b1f756031402f117002b (diff)
downloadQt-11e9386c5704fe1a008370e032e6f114a458a473.zip
Qt-11e9386c5704fe1a008370e032e6f114a458a473.tar.gz
Qt-11e9386c5704fe1a008370e032e6f114a458a473.tar.bz2
Fix compilation: intptr_t -> quintptr
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qeasingcurve.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 89edb2d..64b4dca 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 << quint64(intptr_t(easing.d_ptr->func));
+ stream << quint64(quintptr(easing.d_ptr->func));
bool hasConfig = easing.d_ptr->config;
stream << hasConfig;
@@ -893,7 +893,7 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing)
quint64 ptr_func;
stream >> ptr_func;
- easing.d_ptr->func = QEasingCurve::EasingFunction(intptr_t(ptr_func));
+ easing.d_ptr->func = QEasingCurve::EasingFunction(quintptr(ptr_func));
bool hasConfig;
stream >> hasConfig;