From a1ef6b00875fbe79f5a68b17d3c4f83478bef91d Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@digia.com>
Date: Tue, 23 Apr 2013 12:41:57 +0200
Subject: [PATCH] Doc: remove references to toWinHBitmap and fromWinHBitmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Task-number: QTBUG-30738
Change-Id: I5a33493b37488b3ac4f5a499e5c5aa22e4e277f4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
src/gui/image/qpixmap.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 85f0dc2d92b..04f0da1a83c 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1310,9 +1310,7 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
file, optionally manipulating the image data, before the QImage
object is converted into a QPixmap to be shown on
screen. Alternatively, if no manipulation is desired, the image
- file can be loaded directly into a QPixmap. On Windows, the
- QPixmap class also supports conversion between \c HBITMAP and
- QPixmap.
+ file can be loaded directly into a QPixmap.
QPixmap provides a collection of functions that can be used to
obtain a variety of information about the pixmap. In addition,
@@ -1410,14 +1408,9 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
QPixmap using the fromImage(). If this is too expensive an
operation, you can use QBitmap::fromImage() instead.
- In addition, on Windows, the QPixmap class supports conversion to
- and from HBITMAP: the toWinHBITMAP() function creates a HBITMAP
- equivalent to the QPixmap, based on the given HBitmapFormat, and
- returns the HBITMAP handle. The fromWinHBITMAP() function returns
- a QPixmap that is equivalent to the given bitmap which has the
- specified format. The QPixmap class also supports conversion to
- and from HICON: the toWinHICON() function creates a HICON equivalent
- to the QPixmap, and returns the HICON handle. The fromWinHICON()
+ The QPixmap class also supports conversion to and from HICON:
+ the toWinHICON() function creates a HICON equivalent to the
+ QPixmap, and returns the HICON handle. The fromWinHICON()
function returns a QPixmap that is equivalent to the given icon.
\section1 Pixmap Transformations
--
GitLab