1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1616660720

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-25 10:12:07 +00:00
commit e272070047
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/benchmarks/gui/animation/qanimation/dummyanimation.h
View File

@ -37,8 +37,8 @@ class DummyAnimation : public QVariantAnimation
public: public:
DummyAnimation(DummyObject *d); DummyAnimation(DummyObject *d);
void updateCurrentValue(const QVariant &value); void updateCurrentValue(const QVariant &value) override;
void updateState(State newstate, State oldstate); void updateState(State newstate, State oldstate) override;
private: private:
DummyObject *m_dummy; DummyObject *m_dummy;

2
tests/benchmarks/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -81,7 +81,7 @@ public:
} }
} }
void paintEvent(QPaintEvent *) void paintEvent(QPaintEvent *) override
{ {
static int color = Qt::black; static int color = Qt::black;