diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-06 16:14:30 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-27 12:13:08 +0200 |
| commit | ffde7e8995be207d3a3d628a31dbb19ba683a1c7 (patch) | |
| tree | d0450e8436a7ec7c2e6b66ea5af1bc6cc0094179 /tests/auto/gui/image | |
| parent | 7a5f865186b3dd831c5943ca6050437fc17abb87 (diff) | |
QIcon: Add pixmap() overload which take devicePixelRatio
Add new QIcon::pixmap() overload:
QPixmap pixmap(const QSize &size, qreal devicePixelRatio, ...)
This function replaces the existing pixmap() function which
take a QWindow pointer, and should be more convenient in use.
Task-number: QTBUG-85885
Change-Id: Ie4ca96a266d9278864678dc61bdfc2836cabdb93
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/gui/image')
| -rw-r--r-- | tests/auto/gui/image/qicon/tst_qicon.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index c03ca32ac3..46bdd9ef2c 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -55,6 +55,7 @@ private slots: void cacheKey(); void detach(); void addFile(); + void pixmap(); void availableSizes(); void name(); void streamAvailableSizes_data(); @@ -447,6 +448,19 @@ void tst_QIcon::addFile() expectedHighDpiImage(128, ":/styles/commonstyle/images/standardbutton-save-%1.png")); } +void tst_QIcon::pixmap() +{ + QIcon icon; + icon.addFile(m_pngImageFileName, QSize(64, 64)); + + // Exercise all pixmap() API overloads + QVERIFY(icon.pixmap(16).size().width() >= 16); + QVERIFY(icon.pixmap(16, 16).size().width() >= 16); + QVERIFY(icon.pixmap(QSize(16, 16)).size().width() >= 16); + QVERIFY(icon.pixmap(QSize(16, 16), 1).size().width() == 16); + QVERIFY(icon.pixmap(nullptr, QSize(16, 16)).size().width() >= 16); +} + static bool sizeLess(const QSize &a, const QSize &b) { return a.width() < b.width(); |