diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-13 16:02:05 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-13 16:02:05 (GMT) |
| commit | dc5c5104a3f31b03954b33e1c098e17bc4634f27 (patch) | |
| tree | 6e4961f5154a64196435688d4895e5222046634b /examples | |
| parent | 82b3e65875fe018c2571d83dabe87bb396e8b60a (diff) | |
| parent | e1b03bac22f87edbbe78eba366966259be6eb0ed (diff) | |
| download | Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.zip Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.tar.gz Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/animation/moveblocks/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp index 4475cbb..d70326e 100644 --- a/examples/animation/moveblocks/main.cpp +++ b/examples/animation/moveblocks/main.cpp @@ -147,7 +147,6 @@ QState *createGeometryState(QObject *w1, const QRect &rect1, { QState *result = new QState(parent); result->assignProperty(w1, "geometry", rect1); - result->assignProperty(w1, "geometry", rect1); result->assignProperty(w2, "geometry", rect2); result->assignProperty(w3, "geometry", rect3); result->assignProperty(w4, "geometry", rect4); |