diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 13:39:39 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 14:50:26 (GMT) |
| commit | d033442f92cfee0de952578044bbcb5e858ee835 (patch) | |
| tree | 4a888fc9dd4a136901f816968ac82cb3d57516dd /src/qt3support/text | |
| parent | bbbd8d402ed5c37d43bd419e7b461f9bacad792f (diff) | |
| download | Qt-d033442f92cfee0de952578044bbcb5e858ee835.zip Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.gz Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.bz2 | |
Imporve win64 support for mingw
Reviewed-by: ogoffart
Diffstat (limited to 'src/qt3support/text')
| -rw-r--r-- | src/qt3support/text/q3richtext.cpp | 2 | ||||
| -rw-r--r-- | src/qt3support/text/q3textstream.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp index 21383bd..8614076 100644 --- a/src/qt3support/text/q3richtext.cpp +++ b/src/qt3support/text/q3richtext.cpp @@ -6667,7 +6667,7 @@ Q3TextImage::Q3TextImage(Q3TextDocument *p, const QMap<QString, QString> &attr, imageName = attr[QLatin1String("source")]; if (!imageName.isEmpty()) { - imgId = QString::fromLatin1("%1,%2,%3,%4").arg(imageName).arg(width).arg(height).arg((ulong)&factory); + imgId = QString::fromLatin1("%1,%2,%3,%4").arg(imageName).arg(width).arg(height).arg((quintptr)&factory); if (!pixmap_map) pixmap_map = new QMap<QString, QPixmapInt>; if (pixmap_map->contains(imgId)) { 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; } |