summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix possible crash when overriding a signal handler.Michael Brasser2009-11-054-3/+36
|
* Fix signal overriding.Michael Brasser2009-11-051-1/+1
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0589-232/+223
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0529-36/+758
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Remove "to" limit on minor version.Warwick Allison2009-11-0586-222/+204
| | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-053-214/+0
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0459-145/+1157
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Remove property-order sensitivity.Warwick Allison2009-11-043-5/+18
| | | | | | | | | | | | | | | | | | | | Fixes autotest.
| * | | | Remove invalid testWarwick Allison2009-11-041-5/+1
| | | | |
* | | | | visual tests for borderimageYann Bodson2009-11-0554-0/+10724
| | | | |
* | | | | update rect visualsYann Bodson2009-11-052-0/+355
| |_|_|/ |/| | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0526-179/+638
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-054-219/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | QmlPropertyMap autotest update.Michael Brasser2009-11-051-5/+7
| | | |_|/ | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-0489-1298/+2777
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove IntegerModel. model properties accept an integer.Martin Jones2009-11-043-214/+0
| | | | |
| * | | | Partial valuetypes testAaron Kennedy2009-11-0523-0/+671
| | |/ / | |/| |
* | | | more borderimage autotestsYann Bodson2009-11-053-30/+70
| | | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0497-1312/+2863
|\ \ \ \ | |/ / / | | | | | | | | into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-042-0/+11
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-11-0446-1192/+1852
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Rebuild configure.exe (using a vs2005 compiler)Kai Koehne2009-11-041-0/+0
| | | | |/ | | | |/| | | | | | | | | | | The same was done in 4.6 (04d5735a)
| | * | | Add missing file.Michael Brasser2009-11-041-0/+11
| | | | |
| * | | | declarative.pro updateAaron Kennedy2009-11-041-33/+36
| | | | |
| * | | | Missing file for 48ea5a5c74620f9811debc6bf1e49bf095d30722Aaron Kennedy2009-11-041-3/+3
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-0438-1167/+1706
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | docs (somewhere is better than nowhere)Warwick Allison2009-11-041-1/+30
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-042-2/+70
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-049-26/+37
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Improve Loader testsMartin Jones2009-11-042-2/+70
| | | | | |
| | * | | | Update visual tests (mae fixed line spacing)Warwick Allison2009-11-0429-1152/+1590
| | | |/ / | | |/| |
| | * | | Fix 5f19daab6baba7d09853058355a66090a3781430Warwick Allison2009-11-041-5/+3
| | | | |
| | * | | Fix "initial" size for remote content.Warwick Allison2009-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | See also 91be655a7e893d34fdbdb71aa5a329b641c80992
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0412-48/+318
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Fix test.Warwick Allison2009-11-041-2/+6
| | | | | |
| | * | | | Ensure root object is at least created.Warwick Allison2009-11-043-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Tweak for QTBUG-5296 (lots of other examples hang too though)
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-04935-39344/+28574
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | testsAaron Kennedy2009-11-046-93/+856
| | | | | |
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-0426-32/+626
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Ignore gcov filesAaron Kennedy2009-11-041-0/+1
| | | | | | |
| * | | | | | Improve qmllanguage test caseAaron Kennedy2009-11-0449-16/+250
| | | | | | |
* | | | | | | autotestsYann Bodson2009-11-042-1/+10
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-04893-39247/+27687
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into kinetic-declarativeui
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-04928-39319/+28408
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | More XmlListModel tests.Michael Brasser2009-11-045-23/+172
| | | |_|/ | | |/| |
| | * | | Remove examples of removed effects.Warwick Allison2009-11-041-63/+12
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0413-58/+405
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Remove support for removed effects.Warwick Allison2009-11-041-97/+0
| | | | | | | | | | | | | | | | | | | | | | | | See d576d770b9b8251f1b5b4808a84045af33e62dba
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0439-47/+806
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-04882-39053/+27378
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h