summaryrefslogtreecommitdiffstats
path: root/src
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-2613-522/+383
|\
| * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25173-3290/+8122
| |\
| * | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| * | Fix warnings and build on mingwThierry Bastian2010-03-253-473/+144
| * | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
| * | 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-2583-1252/+1263
| |\ \
| | * | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-252-6/+129
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2579-1243/+1128
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-253-21/+53
| | | |\ \
| | * | | | Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | * | | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-251-2/+2
| | | |/ / | | |/| |
| * | | | 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-2418-35/+63
| |\ \ \
| * | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
* | | | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| |_|_|/ |/| | |
* | | | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
* | | | 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-2579-1242/+1127
|\ \ \ \
| * \ \ \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-252-9/+9
| | |\ \ \
| | | * | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
| | | | |/ | | | |/|
| | * | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| | * | | Doc fix.Michael Brasser2010-03-253-3/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2510-38/+81
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-257-34/+50
| | | |\ \ \
| | | | * | | Replace Animation's repeat property with loops.Michael Brasser2010-03-257-34/+50
| | | * | | | 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-2410-23/+33
| | | |\ \ \ \
| | | * | | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| | * | | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| | | |_|/ / / | | |/| | | |
| | * | | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | | |/ / / | | |/| | |
| | * | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-249-23/+23
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| | |\ \ \
| | * | | | Fix leak.Michael Brasser2010-03-241-1/+2
| | * | | | StateChangeScript doc.Michael Brasser2010-03-241-2/+24
| | * | | | A StateChangeScript should never be run when leaving the state.Michael Brasser2010-03-242-5/+11
| | * | | | ScriptAction doc.Michael Brasser2010-03-241-0/+31
| | * | | | Rename stateChangeScriptName to scriptName.Michael Brasser2010-03-243-3/+4
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2416-203/+185
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2411-92/+175
| | | |\ \ \ \
| | | | * | | | Fix abort in flipableLeonardo Sobral Cunha2010-03-241-1/+1
| | | | * | | | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52
| | | | * | | | Properly use one thread for all instances of XmlListModel.Bea Lam2010-03-242-83/+122
| | | * | | | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | | * | | | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-246-55/+0
| | | |/ / / /
| | | * | | | Make compile.Michael Brasser2010-03-241-1/+1
| | | * | | | Output all Loader errors.Michael Brasser2010-03-241-0/+2