summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Rohan McGovern2009-09-090-0/+0
|\ | | | | | | | | Conflicts: tests/auto/moc/os9-newlines.h
| * network-settings.h: Check for DNS setup only when neededMarkus Goetz2009-09-081-0/+2
| |
| * Fix moc test after licence change.Olivier Goffart2009-09-081-1/+1
| | | | | | | | os9-newlines.h must not contains any linebreak
* | Merge commit 'bc02fbf402f922b41ae6ffb5ad3ede9101456a44' into 4.6Rohan McGovern2009-09-090-0/+0
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-082-7/+33
| |\
| * | Update license headers again.Jason McDonald2009-09-088050-32121/+32169
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit '4feb4019cfc144cef4cd9177d52e52dee9ebdf32' into 4.6Rohan McGovern2009-09-0936-173/+436
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qpainter/tst_qpainter.cpp
| * | Fixed bug in drawImage() when fall-back code path is used.Samuel Rødal2009-09-082-7/+33
| |/ | | | | | | | | | | | | | | We need to floor instead of round to prevent rectangles that are on the edge from being shifted one pixel down / right. Task-number: 258776 Reviewed-by: Kim
| * Update license headers.Jason McDonald2009-09-0834-166/+403
| | | | | | | | Reviewed-by: Trust Me
| * Tests: Do not execute network tests at all if DNS setup is broken.Markus Goetz2009-09-081-0/+14
| | | | | | | | Reviewed-by: Jesper
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-094-8/+58
|\ \
| * | Fix windows implemetation of QLocalSocket to emit bytesWritten() signalabcd2009-09-094-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | Have QWindowsPipeWriter emit a bytesWritten signal and have QLocalSocket connect this to its own bytesWritten signal. This change contains an autotest to check for the signal emission. Previously there was no implementation to emit the signal.
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-092-8/+32
|\ \ \ | |/ /
| * | 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.
* | | Clean up the gradient cache in the right contextRhys Weatherley2009-09-091-0/+1
|/ / | | | | | | | | | | | | | | | | | | QGLGradientCache for the OpenGL1 paint engine has to destroy the cached gradient textures if the QGLContext changes. Problem is, it wasn't changing back to the previous context to destroy those textures. Task-number: 249919 Reviewed-by: Sarah Smith
* | 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
| |
* | Revert "network-settings.h: Compile fix relating to some tests"Markus Goetz2009-09-081-0/+2
| | | | | | | | This reverts commit 69e5a3fce4d355822367dc1a17179a364111632e.
* | Doc: fixing a QFileInfo snippet typeJoão Abecasis2009-09-081-3/+3
| | | | | | | | Task-number: 258371
* | Fixed usage of QMargins in QStyleSheetStyleThorbjørn Lindeijer2009-09-081-4/+4
| | | | | | | | | | | | | | The order of the parameters to the QMargins constructor changed in commit 758f4735bcae034ac25730e53bb371df3b7d6e8a. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | network-settings.h: Compile fix relating to some testsMarkus Goetz2009-09-081-2/+0
| | | | | | | | Reviewed-by: TrustMe
* | Fix QWS autotests after S60 integrationPaul Olav Tvete2009-09-085-5/+0
| | | | | | | | Reviewed-by: trustme
* | Added a public function to enforce usage og the old GL engine.Trond Kjernåsen2009-09-085-11/+87
| | | | | | | | | | | | | | | | | | | | | | Some applications that uses a mix of OpenGL and QPainter code may not work correctly with the new GL 2 engine (e.g. the composition demo). The same is most likely also true for user apps, therefore we need a way to enforce the usage of the old GL 1 engine for the sake of compatibility. Task-number: 260872 Reviewed-by: Samuel
* | QScriptDebuggerBackend crash fix.Jedrzej Nowacki2009-09-081-7/+1
| | | | | | | | | | | | | | | | | | | | QScriptDebuggerBackend::contextCount() method was trying to count number of context push & pop and result was not equal to elements count in QScriptDebuggerBackend::contextIds() list. Patch change QScriptDebuggerBackend::contextCount() to call count() on ids list. Task-number: 260719 Reviewed-by: Kent Hansen
* | fix major memory leak in JavaScriptCore RegisterFile on Windows CEJoerg Bornemann2009-09-081-0/+3
| | | | | | | | | | | | | | | | On Widows CE we must decommit all committed pages before we release them. See VirtualFree documentation. Desktop Windows behaves much smoother in this situation. Reviewed-by: ariya
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-081-7/+10
|\ \
| * | Make tst_qmdiarea more robustOlivier Goffart2009-09-081-7/+10
| | |
* | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0864-1079/+514
|\ \ \ | |/ /
| * | Add license header.Jason McDonald2009-09-081-0/+41
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed QLineEdit to correctly adjust the horizontal scrollingAdriano Rezende2009-09-082-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The widget needs to use the naturalTextWidth to adjust the horizontal scrolling, otherwise it will not fit correctly the text in the visible area when resized. Merge-request: 1410 Reviewed-by: Alan Alpert
| * | Fixes a regression in QListView in 4.6 regarding the selectionThierry Bastian2009-09-082-0/+34
| | | | | | | | | | | | | | | | | | | | | In icon mode, if you click on the viewport (with extended selection), the selection should be cleared when you release the mouse button. Reviewed-by: ogoffart
| * | Animations of redocking widgets are brokenThierry Bastian2009-09-081-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that when starting an animation, we delay it by starting a 0-timer. That doesn't work on windows while dragging a native window. Task-number: 260772 Reviewed-by: prasanth
| * | doc: Fixed several qdoc errors.Martin Smith2009-09-083-4/+11
| | | | | | | | | | | | That's the last of them... for now.
| * | Try to make test more robust.Olivier Goffart2009-09-0816-84/+130
| | | | | | | | | | | | | | | | | | | | | | | | By using QTRY_{COMPARE,VERIFY} instead of waiting an arbitrary amount of time waiting for the window manager to do his job. Also use QApplication::setActiveWindow which seems to be more robust then QWidget::activateWindow
| * | Fix autotestmae2009-09-081-0/+8
| | | | | | | | | | | | | | | The piece table test relied on previous automatic edit command grouping. The grouping now has to be enforced explicitely with beginEditGroup()/endEditGroup()
generated by cgit v0.12 at 2024-09-20 06:28:49 (GMT)