AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1616418060

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-22 19:08:26 +00:00
commit 55fdd5e705
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/lance/interactivewidget.h
View File

@ -50,7 +50,7 @@ public slots:
void save();
protected:
bool eventFilter(QObject *o, QEvent *e);
bool eventFilter(QObject *o, QEvent *e) override;
protected slots:
void cmdSelected(QListWidgetItem *item);

2
tests/manual/lance/main.cpp
View File

@ -633,7 +633,7 @@ int main(int argc, char **argv)
+ input.suffix() + QStringLiteral(".pdf");
p.setOutputFormat(QPrinter::PdfFormat);
p.setOutputFileName(file);
p.setPageSize(QPrinter::A4);
p.setPageSize(QPageSize(QPageSize::A4));
QPainter pt(&p);
pcmd.setPainter(&pt);
pcmd.setFilePath(fileinfo.absolutePath());

12
tests/manual/lance/widgets.h
View File

@ -131,12 +131,12 @@ public:
void setCheckersBackground(bool b) { m_checkersBackground = b; }
void setType(DeviceType t) { m_deviceType = t; }
void resizeEvent(QResizeEvent *e) {
void resizeEvent(QResizeEvent *e) override {
m_image = QImage();
T::resizeEvent(e);
}
void paintEvent(QPaintEvent *) {
void paintEvent(QPaintEvent *) override {
switch (m_view_mode) {
case RenderView: paintRenderView(); break;
case BaselineView: paintBaselineView(); break;
@ -254,7 +254,7 @@ public:
}
void mouseMoveEvent(QMouseEvent *e)
void mouseMoveEvent(QMouseEvent *e) override
{
if (m_currentPoint == -1)
return;
@ -263,7 +263,7 @@ public:
T::update();
}
void mousePressEvent(QMouseEvent *e)
void mousePressEvent(QMouseEvent *e) override
{
if (e->button() == Qt::RightButton) {
m_showControlPoints = true;
@ -280,7 +280,7 @@ public:
T::update();
}
void mouseReleaseEvent(QMouseEvent *e)
void mouseReleaseEvent(QMouseEvent *e) override
{
if (e->button() == Qt::LeftButton)
m_currentPoint = -1;
@ -289,7 +289,7 @@ public:
T::update();
}
QSize sizeHint() const { return QSize(800, 800); }
QSize sizeHint() const override { return QSize(800, 800); }
QList<QPointF> m_controlPoints;
int m_currentPoint;