summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| | * | | Update visual tests (mae fixed line spacing)Warwick Allison2009-11-0429-1152/+1590
| | | | |
| * | | | 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
| | | | | | |
* | | | | | | Remove IntegerModel. model properties accept an integer.Martin Jones2009-11-043-214/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-049-26/+37
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | 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
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-04893-39247/+27687
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | | less compile warningsYann Bodson2009-11-043-14/+21
| | | | | | |
| * | | | | | 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)
* | | | | | | Improve Loader testsMartin Jones2009-11-042-2/+70
| |_|/ / / / |/| | | | |
* | | | | | 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
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-0416-22/+233
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-11-045-0/+54
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Doc.Michael Brasser2009-11-041-0/+3
| | | | | | |
| | | * | | | Start on QmlXmlListModel autotest.Michael Brasser2009-11-045-0/+154
| | | | | | |
| | | * | | | Fix test after rename.Michael Brasser2009-11-046-22/+22
| | | | | | |
| | * | | | | more autotestsYann Bodson2009-11-042-36/+226
| | |/ / / /
| * | | | | 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
| | * | | | Add closestAngle function to Qt object to help with rotation animations.Alan Alpert2009-11-045-0/+54
| | |/ / / | | | | | | | | | | | | | | | Includes test and doc.
| | * | | Rename QmlGraphicsPixmapCache to QmlPixmapCache.Michael Brasser2009-11-048-34/+35
| | | | |
| | * | | States autotest + missing files.Michael Brasser2009-11-0410-0/+351
| | | | |
| | * | | DateTimeFormatter autotests.Michael Brasser2009-11-041-0/+10
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-045-0/+165
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | use same name for setter/getter and propertyYann Bodson2009-11-046-14/+14
| | | | | |
| * | | | | 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
| | * | | | | Implement internal support for property interceptors (used by declarative).Michael Brasser2009-11-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy
| | * | | | | QGtkStyle refactoringRobert Griebl2009-11-0313-1350/+1455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| | * | | | | Changes for DirectFBAnders Bakken2009-11-031-5/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit compile fix for Windows CE Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman