summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimage.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-24 09:22:16 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-24 22:51:46 +0200
commitf06dfb60b96004971917a27559713314b7f60de6 (patch)
tree269572c9e5a564851d410b871fe0d78cfadeb567 /src/gui/image/qimage.h
parentb4aee30692c166025b4e2283c19dbc1247bcce54 (diff)
QtGui: Add Windows conversion functions for to QImage
Add conversions from/to HBITMAP, HICON to QImage. Split the pixmap conversion functions apart to use them. Task-number: QTBUG-81876 Change-Id: Ic0c41a402a1f6e9bec572fc4d691357bd48e6423 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/image/qimage.h')
-rw-r--r--src/gui/image/qimage.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index b8f2dd8faf..2743ed285a 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -298,6 +298,11 @@ public:
// Platform specific conversion functions
#if defined(Q_OS_DARWIN) || defined(Q_QDOC)
CGImageRef toCGImage() const Q_DECL_CF_RETURNS_RETAINED;
+#elif defined(Q_OS_WIN) || defined(Q_QDOC)
+ HBITMAP toHBITMAP() const;
+ HICON toHICON(const QImage &mask = {}) const;
+ static QImage fromHBITMAP(HBITMAP hbitmap);
+ static QImage fromHICON(HICON icon);
#endif
protected: