diff options
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 09d23c0084..4ab8160f21 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -125,12 +125,8 @@ QPixmap::QPixmap() */ QPixmap::QPixmap(int w, int h) - : QPaintDevice() + : QPixmap(QSize(w, h)) { - if (!qt_pixmap_thread_test()) - doInit(0, 0, QPlatformPixmap::PixmapType); - else - doInit(w, h, QPlatformPixmap::PixmapType); } /*! @@ -144,12 +140,8 @@ QPixmap::QPixmap(int w, int h) */ QPixmap::QPixmap(const QSize &size) - : QPaintDevice() + : QPixmap(size, QPlatformPixmap::PixmapType) { - if (!qt_pixmap_thread_test()) - doInit(0, 0, QPlatformPixmap::PixmapType); - else - doInit(size.width(), size.height(), QPlatformPixmap::PixmapType); } /*! @@ -778,7 +770,7 @@ bool QPixmap::load(const QString &fileName, const char *format, Qt::ImageConvers QFileInfo info(fileName); QString key = QLatin1String("qt_pixmap") % info.absoluteFilePath() - % HexString<uint>(info.lastModified().toTime_t()) + % HexString<uint>(info.lastModified().toSecsSinceEpoch()) % HexString<quint64>(info.size()) % HexString<uint>(data ? data->pixelType() : QPlatformPixmap::PixmapType); |