Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (21 commits)
  QFile cannot deal with crlf-translated stdio, so use binary mode
  remove trimming of (expected) output
  really fix the autotest
  support regexp-like quantifiers of expected output lines
  remove superfluous \r filtering
  print actual rather than expected output for matching text
  Do not set the font size unnecessarily in the simulated s60 style.
  Doc typos fixed
  Translations: Update German for 4.6.1
  fix test under windows
  don't complain about unresolved base when the reference is absolute
  make the lupdate tests more verbose in case of failure
  don't use qmake for test setup
  move equivalent of output_ts test to good/
  look for the .result file in the dir where the output is expected to go
  fix sametext and number heuristics
  fix number heuristics, part 1
  no point in specifying -ts when a .pro file is specified
  clean up the lupdatecmd files
  tidy up the test .pro files
  ...

1 files changed, 0 insertions, 1 deletions

diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index f8aa434..a2c0958 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);