Merge integration refs/builds/qtci/dev/1616660720
This commit is contained in:
commit
e272070047
@ -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;
|
||||||
|
@ -81,7 +81,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void paintEvent(QPaintEvent *)
|
void paintEvent(QPaintEvent *) override
|
||||||
{
|
{
|
||||||
static int color = Qt::black;
|
static int color = Qt::black;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user