summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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
| | | | | | | | | |
| | | | | * | | | | Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.Samuel Rødal2009-10-061-10/+11
| | | | | | | | | |
| | | | | * | | | | Made GL 2 paint engine waste less bits in clipping algorithm.Samuel Rødal2009-10-061-5/+4
| | | | | | | | | |
| | | | | * | | | | Refactored GL 2 engine UniteClip to always increase max depth.Samuel Rødal2009-10-061-3/+2
| | | | | | | | | |
| | | | | * | | | | Moved maxDepth out of state object and got rid of unused state members.Samuel Rødal2009-10-062-14/+9
| | | | | | | | | |
| | | | | * | | | | Fixed missing stencil buffer clear when scissor testing is disabled.Samuel Rødal2009-10-061-1/+3
| | | | | | | | | |
| | | | * | | | | | QScriptContext::parentContext: don't skip unessecary framesOlivier Goffart2009-10-062-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 mmfphononFrans Englich2009-10-06361-2254/+4707
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-063-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 Menard2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Thiago
| | | | | * | | | | | tst_qnetworkreply: httpConnectionCount test improvementsMarkus Goetz2009-10-061-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | | * | | | | | Build fix.Alexis Menard2009-10-061-1/+1
| | | | | | | | | | |
| | | | | * | | | | | add test for QT-2270Kent Hansen2009-10-061-0/+17
| | | | | | | | | | |
| | | | | * | | | | | Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cppJørgen Lind2009-10-062-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>
| | | | | * | | | | | tst_qhttpnetworkconnection: Some more checksMarkus Goetz2009-10-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more checks (test still passes) Reviewed-by: TrustMe
| | | | | * | | | | | Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-062-0/+5
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira
| | | | | * | | | | add missing includeKent Hansen2009-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary since the SignalEvent class was moved to qstatemachine.h.
| | | | | * | | | | Fixed some projective transform rendering bugs on qreal=float platforms.Samuel Rødal2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should set the near clip slightly higher when qreal is float to avoid numerical precision problems. Reviewed-by: Trond
| | | | | * | | | | Fixed bug in GL 2 engine when using beginNativePainting.Samuel Rødal2009-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set shader manager to dirty in case we change the shader program using native calls. Reviewed-by: Trond
| | | | | * | | | | compile without QT3SUPPORTJoerg Bornemann2009-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | | | | * | | | | QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 4.6 API review. Reviewed-by: Volker Hilsheimer
| | | | | * | | | | Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-10-062-0/+3
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | | | | * | | | tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fixJoerg Bornemann2009-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need some more time on Windows mobile to receive all events. Reviewed-by: thartman
| | | | | | * | | | tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fixJoerg Bornemann2009-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must make sure that the graphics view scene is centered to make this test work. On Windows mobile, the widget was too wide and the scene wasn't centered. Reviewed-by: thartman
| | | | | | * | | | tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobileJoerg Bornemann2009-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test depends on a layout spacing set to 6. The Windows mobile style has layout spacing 8. Reviewed-by: mauricek
generated by cgit v0.12 at 2024-11-17 03:36:19 (GMT)