summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Font-portable.Warwick Allison2009-10-086-301/+220
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-0734-733/+714
|\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/tutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc
| * doc cleanupYann Bodson2009-10-079-322/+322
| |
| * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-072-0/+1
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix QFxTextInputAlan Alpert2009-10-071-0/+1
| | | | | | | | | | | | It was accepting input on both press and release, for some reason
| | * Smaller gif file for the advanced tutorialAlan Alpert2009-10-071-0/+0
| | |
| * | move files to avoid duplication.Yann Bodson2009-10-078-40/+20
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-071-36/+44
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-075-0/+119
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-0776-748/+1314
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Compile on Symbian.Martin Jones2009-10-071-36/+44
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-0782-756/+1460
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Get two of those new autotests to pass.Alan Alpert2009-10-074-21/+19
| | | | | | | | | | | | | | | | | | | | The third will not pass until QT-2240 is fixed.
| | * | | Add three failing tests to the QML ECMAscript autotestAlan Alpert2009-10-075-0/+121
| | | |/ | | |/| | | | | | | | | | | | | | | | | Tests the creation, deletion and toString functions for QML objects. Task-number: QT-2252
| * | | Update 'hello world' tutorial.Yann Bodson2009-10-0714-319/+192
| | | |
* | | | typosWarwick Allison2009-10-077-12/+12
| |/ / |/| |
* | | Switch Same Game tutorial to using snippets properlyAlan Alpert2009-10-0717-367/+73
| | |
* | | SameGame tutorial imagesAlan Alpert2009-10-074-0/+0
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-0766-62/+1608
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-0719-49/+54
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-07358-2537/+5050
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Fix portability of visual tests: fix filenames to be relative to base (URL).Warwick Allison2009-10-0716-46/+48
| | | | | | | | | | | | | | | | | | | | Still not font-portable.
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-062-2/+58
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-06122-1259/+1495
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Test icon() property.Warwick Allison2009-10-063-3/+6
| | | | | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-07432-3130/+5691
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Add SameGame based advanced tutorialAlan Alpert2009-10-0745-0/+1540
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could use some cleanup, as I didn't manage to get code snippets working correctly. Also might benefit from being re-written by a good tutor.
| * | | | | | Refactor tileSize to the gameCanvas itemAlan Alpert2009-10-072-13/+13
| | | | | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-0662-723/+1072
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | Consistent Commenting in SamegameAlan Alpert2009-10-051-0/+1
| | | | | | | |
* | | | | | | | Remove QFxFlowView and flowview example (will be moved toBea Lam2009-10-076-686/+0
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | research/declarative-ui-examples). Functionality should eventually be added to grid view.
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-07356-2527/+5018
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-061-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | Simplify Rectangle painting.Michael Brasser2009-10-061-30/+7
| | | | | | | |
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-06355-2497/+5011
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | kinetic-declarativeui
| | * | | | | | Update EABI DEF files for Symbian OSIain2009-10-065-40/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | | Merge branch '4.5' into 4.6Thiago Macieira2009-10-061-6/+80
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/networkselftest/tst_networkselftest.cpp
| | | * | | | | | Autotest: add a few more tests, with IP address and actual hostnameThiago Macieira2009-10-061-4/+74
| | | | | | | | |
| | | * | | | | | Autotest: use port 12346 instead of 1, to ensure that it's not aThiago Macieira2009-10-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firewall issue Also check if we're not timing out instead of being able to fail.
| | * | | | | | | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested-By: Volker Hilsheimer
| | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-06198-720/+2342
| | |\ \ \ \ \ \ \
| | | * | | | | | | Optimized restore() in GL 2 paint engine.Samuel Rødal2009-10-062-19/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of what state actually changed so we don't have to set all the uniforms as dirty etc. Reviewed-by: Trond
| | | * | | | | | | Merge branch 'stencil-clipping' into 4.6Samuel Rødal2009-10-062-201/+261
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the GL 2 paint engine to use the stencil buffer instead of the depth buffer for clipping. The stencil buffer is now used both for rasterizing polygons/paths and for clipping. Reviewed-by: Trond
| | | | * | | | | | | Changed GL 2 engine render text implementation to use glDepthRange().Samuel Rødal2009-10-062-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This frees all the current dependencies on the depth uniform.
| | | | * | | | | | | Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-061-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also we should force Raster_A8 glyph format in renderText().
| | | | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Aaron Kennedy's patch. All tests are green, but when enabling scissoring UniteClip seems to be broken atm.
| | | | * | | | | | | 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
| | | | | | | | | | |
generated by cgit v0.12 at 2025-08-12 02:39:09 (GMT)