summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Follow renamed to SpringFollow.Martin Jones2009-09-1019-115/+180
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-109-31/+92
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-109-8/+406
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Report custom parse errors verbosely.Warwick Allison2009-09-109-31/+92
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-103-7/+294
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-09-1011-63/+539
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-099-59/+248
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Start on QFxTextInput autotestsAlan Alpert2009-09-092-4/+291
| | | | | | | | | | | | | | | | | | | | Actually has tests in it now. Not all implemented yet though.
| * | | | typoYann Bodson2009-09-101-3/+3
| |/ / /
* | | | Support URL resolution from within script blocksAaron Kennedy2009-09-102-4/+25
| |/ / |/| |
* | | Autotest for property aliasesAaron Kennedy2009-09-096-1/+112
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-0924-264/+263
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0926-334/+803
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fix more autotestsAlan Alpert2009-09-099-139/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now expect autotests to pass (as much as the rest of Qt) Tests updated: NumberFormatter PathView QBindableMap QFxText QFxTextEdit (still fails) Repeater
| * | Rename QFxItem::children() to QFxItem::fxChildren()Alan Alpert2009-09-094-8/+8
| | | | | | | | | | | | | | | | | | | | | No more accidental hiding. Differently named functions for QObject children: children() QGraphicsItem children: childItems() QFxItem children: fxChildren()
| * | Fix up some of the testsAlan Alpert2009-09-0910-114/+96
| | | | | | | | | | | | | | | | | | | | | | | | Update to work with the latest changes, like 'import Qt 4.6'. Tests affected: DateTimeFormatter Layouts (Positioners) ListView (Still not passing)
| * | Fix bug with keypad navigationAlan Alpert2009-09-091-3/+3
| | | | | | | | | | | | Navigation test now passes.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-0926-334/+803
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-09156-2312/+2484
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Doc.Martin Jones2009-09-091-0/+2
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-09127-1910/+2079
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Move ComponentInstance functionality into LoaderMartin Jones2009-09-0923-396/+373
| | | |
| * | | Add EaseFollow elementAaron Kennedy2009-09-095-3/+493
| | | |
* | | | Don't allow sparse-setting, since not efficient anyway.Warwick Allison2009-09-091-22/+16
| | | |
* | | | clearer exampleWarwick Allison2009-09-091-4/+12
| | | |
* | | | Fix destruction of ModelNodes (fix crash-on-exit).Warwick Allison2009-09-091-7/+6
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-09142-1950/+2266
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-09983-9148/+19963
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxlistview.h
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-09120-1853/+1860
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Remove debug.Michael Brasser2009-09-091-4/+1
| | | | | |
| | | * | | Make sure animations convert between float and double when needed.Michael Brasser2009-09-091-2/+1
| | | | | |
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-08118-1847/+1858
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * | | Fix QDirectFBPixmapData::fromImageAnders Bakken2009-09-081-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix should optimize pixmap loading on most platforms and also fixes a bug on a certain hardware where the alpha channel of an image was not retained upon loading it. This patch also takes care of handling dithering better in QDirectFBPixmapData::fromImage(). Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | Fixes "Out of heap space" error when compiling on some setups.Bill King2009-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original fix was for "out of stack space" due to to low a value, this one is for too high a value.
| | | | * | | Fix define in QDirectFBScreenAnders Bakken2009-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's QT_NO_DIRECTFB.*, not QT_DIRECTFB_NO.* Reviewed-by: TrustMe
| | | | * | | memset DFBWindowDescription to 0Anders Bakken2009-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes debugging easier. Reviewed-by: TrustMe
| | | | * | | Doc: A timeline's current value is not reset when the duration changes.David Boddie2009-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 219152 Reviewed-by: Trust Me
| | | | * | | Cleanup of QGLPaintDevice before it goes inTom Cooksey2009-09-089-430/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the last patch in the QGLPaintDevice series. Although previous patches have not been reviewed individually, Samuel's reviewed QGLPaintDevice API and all the changes as the code stands with this patch. Reviewed-by: Samuel
| | | | * | | Make QGLPixmapData work with the new QGLPaintDevice APITom Cooksey2009-09-087-85/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the ordering of QGL2PaintEngine::begin a bit because QGLPixmapData needs to use the paint engine's drawTexture method within beginPaint(). Also, this initialises needsSync to true and removes the setState call. So now all the state initialisation is done in ensureActive rather than begin.
| | | | * | | Make QGLWindowSurface use new QGLPaintDevice APITom Cooksey2009-09-085-33/+65
| | | | | | |
| | | | * | | Move buffer clear out of the paint engine and into the QGLPaintDevicesTom Cooksey2009-09-086-63/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the paint engine cleared the surface's buffers in begin. This logic really belongs in QGLPaintDevice::beginPaint as not all paint devices will want this behaviour (in fact most don't). This also makes QGLPaintDevice API much simpler as the virtual getters for the clear color, etc. can be removed. It's much cleaner this way. The only possible problem is with the GL1 engine, which also cleared the accumulation & depth buffers in begin. However, the engine will also clear the depth buffer later as part of it's clipping logic. It also doesn't use the accumulation buffer, so clearing it seems unnessisary.
| | | | * | | Make QGLFramebufferObject work again using new QGLPaintDevice APITom Cooksey2009-09-0811-152/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also refactors QGL2PaintEngineEx::ensureActive() and the logic which handles multiple paint engines rendering to the same QGLContext. In a nut-shell: * QGLPaintDevice::beginPaint() stores the currently bound FBO * QGLPaintDevice::ensureActiveTarget() makes sure that GL rendering will end up in the paint device (I.e. the right context is current and the right FBO is bound). If a different context or FBO was bound, it is _not_ remembered. * QGLPaintDevice::endPaint() restores whatever FBO was bound when beginPaint() was called. This logic allows interleaved painter rendering to multiple FBOs and contexts to work as expected. It also allows a stacked begin/end to work properly when it's mixed with native GL rendering (as far as current render target is concerened. GL state clobbering is obviously a different topic). QGLPaintDevice::context() also had to be made virtual as there's no good place to call setContext. This might be possible to change in the future though. Finally, to make this work, QGLFramebufferObjectPrivate had to be moved into it's own private header.
| | | | * | | Make QGLPixelBuffer work again using new QGLPaintDevice APITom Cooksey2009-09-084-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new QGLPBufferGLPaintDevice implementation which allows the GL engines to target QGLPixelBuffers again.
| | | | * | | Replace QGLDrawable with a new QGLPaintDeviceTom Cooksey2009-09-0811-84/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new abstract base class which inherits from QPaintDevice called QGLPaintDevice. This base class will contain everything the GL paint engines need to know about the surface they are drawing onto. As such, new surfaces can be targeted by the GL paint engines without having to modify QtOpenGL. This is very useful for plugins, specifically QGraphicsSystem plugins. To unify things a little, the GL paint engines will use the same QGLPaintDevice API to render into existing target surfaces (QGLWidget, QGLPixelBuffer & QGLFrameBufferObject). Ideally we'd make QGLPaintDevice a common ancestor for these surfaces, but obviously that wil break B/C. This patch only implements QGLWidget using the new interface. Rendering to other surfaces will be fixed in following patches.
| | | | * | | Fix crash when instantiating multiple QApplications on QWSPaul Olav Tvete2009-09-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy variable initialization/cleanup code from X11 Reviewed-by: Tom
| | | | * | | Doc: Fixed bug in style sheet syntax documentation.Geir Vattekar2009-09-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 234366 Reviewed-by: Trust Me
| | | | * | | Take right bearing of glyphs into account when doing text layoutEskil Abrahamsen Blomfeldt2009-09-081-54/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support correctly breaking text and calculating the bounding rect of text that has a right bearing (like italic text), we need to take the bearing into account when doing the layout. We add the bearing when checking whether we need to break the text, and we add it to the natural width of the text whenever we've finished a text line, so that we get the correct bounding rectangle. This patch only takes the last glyph's bearing into account. The theoretically correct approach would be to take all bearings into account and use the one which gives the longest text width. However, in practice the bearing of the glyph will not be great enough for it to span over several other glyphs. Also refactored a little to make the code simpler. Task-number: 176401 Reviewed-by: Simon Hausmann
| | | | * | | tst_qbytearray: set SRCDIR to ./ on Windows CEJoerg Bornemann2009-09-081-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | | | * | | exception safety fix for QList::operator+= (const QList&)mread2009-09-082-32/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring of current++ and src++ out of the new line makes the code easier to understand but it also seems to be significant at least in the ::isComplex case. I suspect that the ordering increment operations vs throw from new is not well defined, or not implemented as you might hope (with the ++ happening very last). The changes in the catch blocks mean that it deletes the created objects, rather than trying with the first failed object. The test code has been updated with a +=(Container) test, and to force testing of both static and moveable types. Reviewed-by: Harald Fernengel
| | | | * | | network-settings.h: Check for DNS setup only when neededMarkus Goetz2009-09-081-1/+2
| | | | | | |
generated by cgit v0.12 at 2024-12-03 20:40:23 (GMT)