diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 12:10:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 12:10:24 (GMT) |
| commit | 32d84d886b6c593b5f41f56ecdc418f6638b1f07 (patch) | |
| tree | c13f6cd77c5d6963f833b280ca707a5461b6f05b /examples | |
| parent | ec82a2e2c596fd623c58a4a003dd2e7603931993 (diff) | |
| parent | 0cd3782fde0da7149771db1c97f1fa6f358564d4 (diff) | |
| download | Qt-32d84d886b6c593b5f41f56ecdc418f6638b1f07.zip Qt-32d84d886b6c593b5f41f56ecdc418f6638b1f07.tar.gz Qt-32d84d886b6c593b5f41f56ecdc418f6638b1f07.tar.bz2 | |
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:
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
remove dead code
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 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); |