summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-262-3/+7
* QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
* Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
* specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
* 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
| | | |/
| | | * 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-244-4/+5
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2435-599/+744
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2415-341/+92
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2413-94/+254
| | | | | |\ \
| | | | | * | | Document QML security considerations.Warwick Allison2010-03-242-0/+91
| | | | | * | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-245-207/+0
| | | | | * | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-248-134/+1
| | | | * | | | DocAaron Kennedy2010-03-241-246/+206
| | | | | |/ / | | | | |/| |
| | | | * | | Fix abort in flipableLeonardo Sobral Cunha2010-03-242-3/+14
| | | | * | | 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-243-83/+188
| | | | |/ /
| | | | * | Make compile.Michael Brasser2010-03-241-1/+1
| | | | * | Output all Loader errors.Michael Brasser2010-03-244-4/+29
| | | | * | Fix Loader leak when loading a non-QGraphicsObject object.Michael Brasser2010-03-243-1/+23
| | | | * | Use setParent_NoEvent in Loader and benchmark Loader performance.Michael Brasser2010-03-246-2/+71