From b2504af4da9d3c2c902a5c1221be3c076c4aff86 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Jul 2020 10:05:18 +0200 Subject: QtGui/Windows: Move the QRegion conversion functions into QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-81876 Change-Id: I2297291a4157e7015f499b0a6127301d9cb58526 Reviewed-by: Tor Arne Vestbø --- tests/auto/gui/painting/qregion/tst_qregion.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'tests/auto/gui/painting/qregion/tst_qregion.cpp') diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp index 93d2baf332..dc694e1107 100644 --- a/tests/auto/gui/painting/qregion/tst_qregion.cpp +++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp @@ -35,6 +35,10 @@ #include #include +#ifdef Q_OS_WIN +# include +#endif + class tst_QRegion : public QObject { Q_OBJECT @@ -86,6 +90,10 @@ private slots: void regionToPath_data(); void regionToPath(); #endif + +#ifdef Q_OS_WIN + void winConversion(); +#endif }; tst_QRegion::tst_QRegion() @@ -1061,7 +1069,21 @@ void tst_QRegion::regionToPath() QCOMPARE(a.boundingRect(), b.boundingRect()); } } -#endif +#endif // QT_BUILD_INTERNAL + +#ifdef Q_OS_WIN +void tst_QRegion::winConversion() +{ + const QList rects{QRect(10, 10, 10, 10), QRect(10, 20, 10, 10), + QRect(30, 20, 10, 10), QRect(10, 30, 10, 10)}; + QRegion region; + region.setRects(rects.constData(), rects.size()); + auto hrgn = region.toHRGN(); + QVERIFY(hrgn); + QRegion convertedBack = QRegion::fromHRGN(hrgn); + QCOMPARE(region, convertedBack); +} +#endif // Q_OS_WIN QTEST_MAIN(tst_QRegion) #include "tst_qregion.moc" -- cgit v1.2.3