diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-24 09:58:57 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-24 09:58:57 (GMT) |
| commit | dfe6974c1e7103ad46fa1162d7c9fd6a426894b7 (patch) | |
| tree | 94b0475734945c9de24a472f70c3bedcd485aee6 /examples/animation/appchooser | |
| parent | 686f82e51124747cbe650d04dfb053830b6660fa (diff) | |
| parent | 221ec8dae1b247d5f8fb03d947d13cb6541a5805 (diff) | |
| download | Qt-dfe6974c1e7103ad46fa1162d7c9fd6a426894b7.zip Qt-dfe6974c1e7103ad46fa1162d7c9fd6a426894b7.tar.gz Qt-dfe6974c1e7103ad46fa1162d7c9fd6a426894b7.tar.bz2 | |
Merge branch 'kinetic-statemachine' into kinetic-animations
Conflicts:
examples/animation/piemenu/qgraphicspiemenu_p.h
Diffstat (limited to 'examples/animation/appchooser')
| -rw-r--r-- | examples/animation/appchooser/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp index 7573347..02302d9 100644 --- a/examples/animation/appchooser/main.cpp +++ b/examples/animation/appchooser/main.cpp @@ -134,7 +134,7 @@ int main(int argc, char **argv) window.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QStateMachine machine; - machine.setGlobalRestorePolicy(QState::RestoreProperties); + machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties); QState *group = new QState(machine.rootState()); group->setObjectName("group"); |