whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qpicture: Remove dependency on widgets 

Use the screen resolution obtained from QScreen instead
of QDesktopWidget.

Change-Id: If27bcf1c94a783c4c617d5364846b95a625bb93d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
bb10
Friedemann Kleint 2018-05-16 10:26:10 +02:00
parent 2d1e1f569b
commit f74d4fb1da
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/gui/image/qpicture/qpicture.pro
View File

@ -1,7 +1,6 @@
CONFIG += testcase
TARGET = tst_qpicture
QT += testlib
qtHaveModule(widgets): QT += widgets
SOURCES += tst_qpicture.cpp

38
tests/auto/gui/image/qpicture/tst_qpicture.cpp
View File

@ -33,10 +33,8 @@
#include <qpainter.h>
#include <qimage.h>
#include <qpaintengine.h>
#ifndef QT_NO_WIDGETS
#include <qdesktopwidget.h>
#include <qapplication.h>
#endif
#include <qguiapplication.h>
#include <qscreen.h>
#include <limits.h>
class tst_QPicture : public QObject
@ -53,11 +51,7 @@ private slots:
void boundingRect();
void swap();
void serialization();
#ifndef QT_NO_WIDGETS
void save_restore();
#endif
void boundaryValues_data();
void boundaryValues();
};
@ -244,30 +238,23 @@ void tst_QPicture::serialization()
}
}
#ifndef QT_NO_WIDGETS
static QPointF scalePoint(const QPointF &point, QPaintDevice *sourceDevice, QPaintDevice *destDevice)
static QRectF scaleRect(const QRectF &rect, qreal xf, qreal yf)
{
return QPointF(point.x() * qreal(destDevice->logicalDpiX()) / qreal(sourceDevice->logicalDpiX()),
point.y() * qreal(destDevice->logicalDpiY()) / qreal(sourceDevice->logicalDpiY()));
}
static QRectF scaleRect(const QRectF &rect, QPaintDevice *sourceDevice, QPaintDevice *destDevice)
{
return QRectF(rect.left() * qreal(destDevice->logicalDpiX()) / qreal(sourceDevice->logicalDpiX()),
rect.top() * qreal(destDevice->logicalDpiY()) / qreal(sourceDevice->logicalDpiY()),
rect.width() * qreal(destDevice->logicalDpiX()) / qreal(sourceDevice->logicalDpiX()),
rect.height() * qreal(destDevice->logicalDpiY()) / qreal(sourceDevice->logicalDpiY()));
return QRectF(rect.left() * xf, rect.top() * yf, rect.width() * xf, rect.height() * yf);
}
static void paintStuff(QPainter *p)
{
QPaintDevice *screenDevice = QApplication::desktop();
p->drawRect(scaleRect(QRectF(100, 100, 100, 100), screenDevice, p->device()));
const QScreen *screen = QGuiApplication::primaryScreen();
// Calculate factors from the screen resolution against QPicture's 96DPI
// (enforced by Qt::AA_Use96Dpi as set by QTEST_MAIN).
const qreal xf = qreal(p->device()->logicalDpiX()) / screen->logicalDotsPerInchX();
const qreal yf = qreal(p->device()->logicalDpiY()) / screen->logicalDotsPerInchY();
p->drawRect(scaleRect(QRectF(100, 100, 100, 100), xf, yf));
p->save();
p->translate(scalePoint(QPointF(10, 10), screenDevice, p->device()));
p->translate(10 * xf, 10 * yf);
p->restore();
p->drawRect(scaleRect(QRectF(100, 100, 100, 100), screenDevice, p->device()));
p->drawRect(scaleRect(QRectF(100, 100, 100, 100), xf, yf));
}
/* See task: 41469
@ -298,7 +285,6 @@ void tst_QPicture::save_restore()
QVERIFY( pix1.toImage() == pix2.toImage() );
}
#endif
void tst_QPicture::boundaryValues_data()
{