summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-556/+555
|\
| * Fix bad mergeOlivier Goffart2010-03-251-15/+7
| * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25284-13975/+13795
| |\
| * | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| * | Fix warnings and build on mingwThierry Bastian2010-03-258-497/+164
| * | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
| * | cetest build fixJoerg Bornemann2010-03-252-1/+4
| * | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
| * | Fixed QPrintPreview text drawing (visible in Assistant).Trond Kjernåsen2010-03-251-2/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-25234-3459/+2754
| |\ \
| | * | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-253-7/+209
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-25228-3448/+2538
| | |\ \
| | | * | stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaintOlivier Goffart2010-03-251-0/+6
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-254-21/+83
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-244-21/+83
| | | | |\ \
| | * | | | | Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | * | | | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-252-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2433-163/+584
| |\ \ \ \
| | * | | | Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211Gabriel de Dietrich2010-03-241-0/+30
| * | | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-263-7/+29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| * | | | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| * | | | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| * | | | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| * | | | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-25226-3447/+2531
| |\ \ \ \
| | * \ \ \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-253-13/+13
|\ \ \ \ \ \
| * | | | | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-253-13/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25223-3435/+2519
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2540-55/+91
| * | | | | Doc fix.Michael Brasser2010-03-253-3/+3
| * | | | | Skip tests for nowBea Lam2010-03-251-0/+4
| * | | | | Make autotest work on windows.Martin Jones2010-03-251-2/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2540-81/+124
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2537-77/+93
| | |\ \ \ \ \
| | | * | | | | Replace Animation's repeat property with loops.Michael Brasser2010-03-2537-77/+93
| | * | | | | | Ensure currentIndex is updated when items inserted before currentIndexMartin Jones2010-03-252-4/+30
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-240-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2414-37/+53
| | |\ \ \ \ \ \
| | * | | | | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| * | | | | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-254-3/+12
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ / / / / | |/| | | | |
| * | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2412-37/+42
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| * | | | | | DocAaron Kennedy2010-03-241-0/+1
| |/ / / / /