diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-23 08:24:31 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-23 08:24:31 (GMT) |
| commit | a948f901b196bab121cb8b5736204b4ce0c09e94 (patch) | |
| tree | e87ac8e797b93203998c1bbb32c2e1120567b137 /src/qt3support/text/q3textstream.cpp | |
| parent | ac99b3e243b331d26815b80aab97cdaf0ed06b0f (diff) | |
| parent | 2e417e2a3963151a2b3a3033e6f5bb0e106d8db4 (diff) | |
| download | Qt-a948f901b196bab121cb8b5736204b4ce0c09e94.zip Qt-a948f901b196bab121cb8b5736204b4ce0c09e94.tar.gz Qt-a948f901b196bab121cb8b5736204b4ce0c09e94.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/qt3support/text/q3textstream.cpp')
| -rw-r--r-- | src/qt3support/text/q3textstream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/text/q3textstream.cpp b/src/qt3support/text/q3textstream.cpp index 41aab4d..8c86c7c 100644 --- a/src/qt3support/text/q3textstream.cpp +++ b/src/qt3support/text/q3textstream.cpp @@ -2084,7 +2084,7 @@ Q3TextStream &Q3TextStream::operator<<( void *ptr ) setf( hex, basefield ); setf( showbase ); unsetf( uppercase ); - output_int( I_LONG | I_UNSIGNED, (ulong)ptr, FALSE ); + output_int( I_LONG | I_UNSIGNED, (quintptr)ptr, FALSE ); flags( f ); return *this; } |