Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | typos | Warwick Allison | 2009-10-07 | 7 | -12/+12 |
| | |||||
* | Switch Same Game tutorial to using snippets properly | Alan Alpert | 2009-10-07 | 17 | -367/+73 |
| | |||||
* | SameGame tutorial images | Alan Alpert | 2009-10-07 | 4 | -0/+0 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-07 | 66 | -62/+1608 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-07 | 19 | -49/+54 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-07 | 358 | -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 Allison | 2009-10-07 | 16 | -46/+48 |
| | | | | | | | | | | | | | | | | Still not font-portable. | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-06 | 2 | -2/+58 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-06 | 122 | -1259/+1495 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Test icon() property. | Warwick Allison | 2009-10-06 | 3 | -3/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-07 | 432 | -3130/+5691 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Add SameGame based advanced tutorial | Alan Alpert | 2009-10-07 | 45 | -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 item | Alan Alpert | 2009-10-07 | 2 | -13/+13 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-06 | 62 | -723/+1072 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | Consistent Commenting in Samegame | Alan Alpert | 2009-10-05 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Remove QFxFlowView and flowview example (will be moved to | Bea Lam | 2009-10-07 | 6 | -686/+0 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | research/declarative-ui-examples). Functionality should eventually be added to grid view. | ||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-07 | 356 | -2527/+5018 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-06 | 1 | -2/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | Simplify Rectangle painting. | Michael Brasser | 2009-10-06 | 1 | -30/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-06 | 355 | -2497/+5011 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | kinetic-declarativeui | ||||
| | * | | | | | | Update EABI DEF files for Symbian OS | Iain | 2009-10-06 | 5 | -40/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | * | | | | | | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-10-06 | 1 | -6/+80 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/networkselftest/tst_networkselftest.cpp | ||||
| | | * | | | | | | Autotest: add a few more tests, with IP address and actual hostname | Thiago Macieira | 2009-10-06 | 1 | -4/+74 |
| | | | | | | | | | |||||
| | | * | | | | | | Autotest: use port 12346 instead of 1, to ensure that it's not a | Thiago Macieira | 2009-10-06 | 1 | -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 Macieira | 2009-10-06 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested-By: Volker Hilsheimer | ||||
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Shane Kearns | 2009-10-06 | 198 | -720/+2342 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Optimized restore() in GL 2 paint engine. | Samuel Rødal | 2009-10-06 | 2 | -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.6 | Samuel Rødal | 2009-10-06 | 2 | -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ødal | 2009-10-06 | 2 | -16/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This frees all the current dependencies on the depth uniform. | ||||
| | | | * | | | | | | | Made depth tested renderText() work after stencil clipping change. | Samuel Rødal | 2009-10-06 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also we should force Raster_A8 glyph format in renderText(). | ||||
| | | | * | | | | | | | Added convex polygon optimization to QGL2PaintEngineExPrivate::fill(). | Samuel Rødal | 2009-10-06 | 1 | -5/+4 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Switched to using stencil instead of depth buffer for clipping. | Samuel Rødal | 2009-10-06 | 2 | -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ødal | 2009-10-06 | 2 | -14/+15 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Got rid of some redundant state changes regarding GL depth state. | Samuel Rødal | 2009-10-06 | 1 | -14/+9 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Renamed GL 2 engine variables to be clip buffer agnostic. | Samuel Rødal | 2009-10-06 | 2 | -52/+52 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine. | Samuel Rødal | 2009-10-06 | 1 | -10/+11 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Made GL 2 paint engine waste less bits in clipping algorithm. | Samuel Rødal | 2009-10-06 | 1 | -5/+4 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Refactored GL 2 engine UniteClip to always increase max depth. | Samuel Rødal | 2009-10-06 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Moved maxDepth out of state object and got rid of unused state members. | Samuel Rødal | 2009-10-06 | 2 | -14/+9 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Fixed missing stencil buffer clear when scissor testing is disabled. | Samuel Rødal | 2009-10-06 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | QScriptContext::parentContext: don't skip unessecary frames | Olivier Goffart | 2009-10-06 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QScriptValue::call doesn't create a fake frame. We can detect a real fake frame as it does not have a callee. Task-number: QT-2270 Reviewed-by: Kent Hansen | ||||
| | | * | | | | | | | | Merge commit 'qt/4.6' into mmfphonon | Frans Englich | 2009-10-06 | 361 | -2254/+4707 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Removed ICON for apps and demos except fluidlauncher and desktopservices | Espen Riskedal | 2009-10-06 | 3 | -31/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mifconv can't always handle absolute paths to the .svg specified, so for now we don't use absolute paths, and fix it later. Task-number: QTBUG-4693 Reviewed-by: Shane Kearns | ||||
| | | | * | | | | | | | | Better compile fix. | Alexis Menard | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Thiago | ||||
| | | | * | | | | | | | | tst_qnetworkreply: httpConnectionCount test improvements | Markus Goetz | 2009-10-06 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | | | * | | | | | | | | Build fix. | Alexis Menard | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | add test for QT-2270 | Kent Hansen | 2009-10-06 | 1 | -0/+17 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cpp | Jørgen Lind | 2009-10-06 | 2 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com> | ||||
| | | | * | | | | | | | | tst_qhttpnetworkconnection: Some more checks | Markus Goetz | 2009-10-06 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more checks (test still passes) Reviewed-by: TrustMe | ||||
| | | | * | | | | | | | | Fixing the compile bug for Symbian when using ARMV5 | Aleksandar Sasha Babic | 2009-10-06 | 2 | -0/+5 |
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira |