1 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 8a63e25..8383194 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -29,6 +29,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/qt_windows.h>
 #include <QtCore/QFileInfo>
+#include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 #include <QtGui/QImage>
 #include <QtWinExtras/QtWin>
@@ -53,6 +54,8 @@ private slots:
     void fromHICON_data();
     void fromHICON();
 
+    void imageConversion();
+
 private:
     const QString m_dataDirectory;
 };
@@ -279,6 +282,21 @@ void tst_QPixmap::fromHICON()
     QVERIFY2(compareImages(imageFromHICON, imageFromFile, &errorMessage), errorMessage.constData());
 }
 
+void tst_QPixmap::imageConversion()
+{
+    // Extensive testing of all formats is done in QtGui; this merely tests
+    // the exports/linkage.
+    QImage image(73, 57, QImage::Format_ARGB32_Premultiplied);
+    image.fill(Qt::red);
+    QPainter painter(&image);
+    painter.drawLine(0, 0, image.width(), image.height());
+    const HBITMAP hBitMap = QtWin::imageToHBITMAP(image);
+    QVERIFY(hBitMap);
+    const QImage fromHBitMap = QtWin::imageFromHBITMAP(hBitMap, QtWin::HBitmapPremultipliedAlpha);
+    QCOMPARE(fromHBitMap, image);
+    DeleteObject(hBitMap);
+}
+
 QTEST_MAIN(tst_QPixmap)
 
 #include "tst_qpixmap.moc"