summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Output file/line for script errorsAaron Kennedy2009-10-0911-45/+70
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-094-72/+89
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-092-45/+82
| |\
| | * GraphicsObjectContainer cleanup.Michael Brasser2009-10-092-45/+82
| * | No need for temporary currentItemMartin Jones2009-10-092-27/+7
| |/
* | Move Q_PROPERTY()'s to top of objectAaron Kennedy2009-10-082-5/+5
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-0814-37/+48
|\ \ | |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-086-12/+24
| |\
| | * Add url() for setUrl().Warwick Allison2009-10-082-0/+11
| * | Remove a bunch of unneeded semicolons.Martin Jones2009-10-0812-37/+37
* | | Fix visual model crash at shutdown due to dangling pointerAaron Kennedy2009-10-081-30/+46
* | | Small optimizationAaron Kennedy2009-10-081-3/+4
* | | Zero bindingBits correctlyAaron Kennedy2009-10-081-2/+3
* | | Fix messed up mergeAaron Kennedy2009-10-081-3/+3
* | | Fix crashAaron Kennedy2009-10-081-1/+1
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-088-70/+90
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-082-22/+32
| |\ \ | | |/
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-082-36/+45
| | |\
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-073-489/+0
| | |\ \
| | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-06269-1691/+3422
| | |\ \ \
| | * | | | Auto tests for QmlTimerMartin Jones2009-10-062-22/+32
| * | | | | Rename preserveSelection to persistentSelectionAlan Alpert2009-10-084-12/+13
| | |_|_|/ | |/| | |
| * | | | Fix QFxTextInputAlan Alpert2009-10-071-0/+1
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-073-489/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Compile on Symbian.Martin Jones2009-10-071-36/+44
| | |_|/ | |/| |
* | | | Use correct file caseAaron Kennedy2009-10-081-3/+3
* | | | Update to use new QScriptDeclarativeClass APIAaron Kennedy2009-10-081-2/+2
* | | | Tweak QScriptDeclarativeClass API to not be so sillyAaron Kennedy2009-10-084-28/+45
* | | | Make qmlecmascript:selfDeletingBinding passAaron Kennedy2009-10-084-133/+182
* | | | Remove bogus assertAaron Kennedy2009-10-071-1/+0
* | | | Add Object.destroy(int delay) parameterAaron Kennedy2009-10-071-3/+5
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-07284-2283/+3723
|\ \ \ \ | | |/ / | |/| |
| * | | Remove QFxFlowView and flowview example (will be moved toBea Lam2009-10-073-489/+0
| |/ /
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-061-2/+5
| |\ \
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Bea Lam2009-10-0610-86/+237
| | |\ \
| | * | | Fix to not crash if item has no parent for some reason.Bea Lam2009-10-061-2/+5
| * | | | Simplify Rectangle painting.Michael Brasser2009-10-061-30/+7
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-06265-1657/+3352
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update EABI DEF files for Symbian OSIain2009-10-065-40/+157
| | * | | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-06163-644/+1236
| | |\ \ \
| | | * | | Optimized restore() in GL 2 paint engine.Samuel Rødal2009-10-062-19/+46
| | | * | | Merge branch 'stencil-clipping' into 4.6Samuel Rødal2009-10-062-201/+261
| | | |\ \ \
| | | | * | | Changed GL 2 engine render text implementation to use glDepthRange().Samuel Rødal2009-10-062-16/+30
| | | | * | | Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-061-7/+10
| | | | * | | Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().Samuel Rødal2009-10-061-5/+4
| | | | * | | Switched to using stencil instead of depth buffer for clipping.Samuel Rødal2009-10-062-121/+173
| | | | * | | Moved GL 2 clip clearing code into a common function.Samuel Rødal2009-10-062-14/+15
| | | | * | | Got rid of some redundant state changes regarding GL depth state.Samuel Rødal2009-10-061-14/+9
| | | | * | | Renamed GL 2 engine variables to be clip buffer agnostic.Samuel Rødal2009-10-062-52/+52