diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/animation/states | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/animation/states')
-rw-r--r-- | examples/widgets/animation/states/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/animation/states/main.cpp b/examples/widgets/animation/states/main.cpp index 14d193c301..0f61b7457a 100644 --- a/examples/widgets/animation/states/main.cpp +++ b/examples/widgets/animation/states/main.cpp @@ -214,7 +214,7 @@ int main(int argc, char *argv[]) state3->assignProperty(p5, "opacity", qreal(1)); state3->assignProperty(p6, "opacity", qreal(1)); - QAbstractTransition *t1 = state1->addTransition(button, SIGNAL(clicked()), state2); + QAbstractTransition *t1 = state1->addTransition(button, &QAbstractButton::clicked, state2); QSequentialAnimationGroup *animation1SubGroup = new QSequentialAnimationGroup; animation1SubGroup->addPause(250); animation1SubGroup->addAnimation(new QPropertyAnimation(box, "geometry")); @@ -239,7 +239,7 @@ int main(int argc, char *argv[]) t1->addAnimation(new QPropertyAnimation(p5, "opacity")); t1->addAnimation(new QPropertyAnimation(p6, "opacity")); - QAbstractTransition *t2 = state2->addTransition(button, SIGNAL(clicked()), state3); + QAbstractTransition *t2 = state2->addTransition(button, &QAbstractButton::clicked, state3); t2->addAnimation(new QPropertyAnimation(box, "geometry")); t2->addAnimation(new QPropertyAnimation(widget, "geometry")); t2->addAnimation(new QPropertyAnimation(p1, "pos")); @@ -261,7 +261,7 @@ int main(int argc, char *argv[]) t2->addAnimation(new QPropertyAnimation(p5, "opacity")); t2->addAnimation(new QPropertyAnimation(p6, "opacity")); - QAbstractTransition *t3 = state3->addTransition(button, SIGNAL(clicked()), state1); + QAbstractTransition *t3 = state3->addTransition(button, &QAbstractButton::clicked, state1); t3->addAnimation(new QPropertyAnimation(box, "geometry")); t3->addAnimation(new QPropertyAnimation(widget, "geometry")); t3->addAnimation(new QPropertyAnimation(p1, "pos")); |