summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix to correctly return property values that are javascript arrays.Bea Lam2010-01-192-20/+30
* Doc.Martin Jones2010-01-191-0/+1
* Allow the QML based file browser to be used in place of native.Martin Jones2010-01-191-0/+2
* Try again to make it compile on Symbian.Martin Jones2010-01-191-11/+23
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-187-1042/+1063
|\
| * Added utility method to parse JavaScript programs.Erik Verbruggen2010-01-187-1110/+1060
| * Added a utility method to get a casted AST root node.Erik Verbruggen2010-01-184-0/+29
| * Fixed the parser to start with the correct rule when requested to parse JS So...Erik Verbruggen2010-01-183-634/+672
| * String->Int conversionAaron Kennedy2010-01-181-0/+4
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-183-1/+32
|\ \ | |/
| * Handle whitespace in Connection signal signatures.Michael Brasser2010-01-183-1/+32
* | Doc.Martin Jones2010-01-181-1/+3
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-187-1165/+1173
|\
| * Autotest for non-existent properties specified in a PropertyChanges.Michael Brasser2010-01-182-0/+25
| * Fixed missing export in generated parser.Erik Verbruggen2010-01-152-2/+2
| * Re-generated grammar and fixed license headers.Erik Verbruggen2010-01-154-1098/+1092
| * Fixed license headers.Erik Verbruggen2010-01-151-66/+44
| * Added utility method to parse single/stand-alone JS source elements.Erik Verbruggen2010-01-151-1/+12
* | Compile on Symbian.Martin Jones2010-01-181-11/+11
|/
* Fix clipping without text cache.Martin Jones2010-01-151-0/+9
* Allow disabling of text cache for non-richtext.Martin Jones2010-01-152-55/+107
* Add basic missing stuff (italic, > < & font size) to styledtext.Martin Jones2010-01-151-85/+72
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-155-5/+49
|\
| * Explicit animations in a transition should mark the property as modified.Michael Brasser2010-01-151-0/+22
| * Doc fixes.Michael Brasser2010-01-153-4/+4
| * QmlGuard the list of objects in a Package.Michael Brasser2010-01-151-1/+23
* | Implement custom QML slot invokation logicAaron Kennedy2010-01-1514-21/+761
* | Update QML following bd3caa48edf2cd53e561cec7ee7ccec6748a4843Aaron Kennedy2010-01-155-29/+31
* | Fix possible crashAaron Kennedy2010-01-152-4/+9
* | Remove unnecessary webkit dependencyAaron Kennedy2010-01-152-11/+1
|/
* Remove debuggingAaron Kennedy2010-01-141-1/+0
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-144-12/+19
|\
| * Test color "from" property.Warwick Allison2010-01-141-0/+9
| * fix testWarwick Allison2010-01-143-10/+8
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2010-01-146-4/+71
| |\
| * | message changedWarwick Allison2010-01-141-2/+2
* | | Add toggle orientation optionAaron Kennedy2010-01-142-0/+14
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-149063-12912/+19768
|\ \ | |/
| * Ref bugWarwick Allison2010-01-141-1/+1
| * docWarwick Allison2010-01-141-26/+12
| * missed fileWarwick Allison2010-01-141-0/+25
| * Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacingWarwick Allison2010-01-141-1/+9
| * Follow change 87a939fa289a0d96c1f0eb10fa74b1cb89fc05f1Warwick Allison2010-01-141-1/+1
| * compileWarwick Allison2010-01-142-9/+18
| * More clarity if test fails.Warwick Allison2010-01-142-0/+6
| * More benchmark cleanup.Michael Brasser2010-01-143-73/+19
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2010-01-149022-12773/+19473
| |\
| | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-149022-12773/+19473
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-131-10/+11
| | | |\
| | | | * Use a QTextBrowser instead of a read only QTextEditHarald Fernengel2010-01-131-10/+11