Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Janne Anttila | 2009-08-31 | 2 | -6/+19 |
|\ | |||||
| * | Fixes compile for my last change. | Bill King | 2009-08-31 | 1 | -1/+1 |
| | | |||||
| * | Adds ability to open sqlite databases readonly. | Bill King | 2009-08-31 | 2 | -6/+19 |
| | | | | | | | | | | | | Changes opening of sqlite to open_v2, and adds a new connection option. Reviewed-by: Justin McPherson | ||||
* | | Added QContextMenuEvent sending to widget in Symbian. | Janne Anttila | 2009-08-31 | 1 | -1/+2 |
|/ | | | | | | | | | The event construction without sending does nothing, sending constructed event possibly dissappeared due to bad merge or something. So here it comes again... Task-number: 260222 Reviewed-by: TrustMe | ||||
* | Added doc link to point to Assistant doc table of collection file values. | Peter Yard | 2009-08-31 | 1 | -0/+8 |
| | | | | Fix for task 259252. | ||||
* | Move QGLShareContextScope to qgl_p.h so other things can use it. | Rhys Weatherley | 2009-08-31 | 2 | -37/+40 |
| | | | | Reviewed-by: trustme | ||||
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Rhys Weatherley | 2009-08-31 | 1 | -11/+11 |
|\ | |||||
| * | Fixes race condition on reopening an ODBC connection. | Bill King | 2009-08-31 | 1 | -11/+11 |
| | | | | | | | | | | | | Original code was keeping it's own (out of date) copy of the handles. It now includes a pointer to the driver private, and asks that what the handles are instead. | ||||
* | | Remove QGLShader from its QGLShaderProgram when it is destroyed | Rhys Weatherley | 2009-08-31 | 2 | -4/+23 |
|/ | | | | Reviewed-by: Samuel | ||||
* | Destroy EGL window surface when direct VG surface is deleted | Rhys Weatherley | 2009-08-30 | 1 | -0/+6 |
| | | | | | | | OpenVG window surfaces were leaking because the QVGEGLWindowSurfaceDirect destructor was previously not cleaning up the EGLSurface object. Reviewed-by: trustme | ||||
* | trivial: make moc compile again | Harald Fernengel | 2009-08-28 | 1 | -0/+2 |
| | |||||
* | Warning -- | Alessandro Portale | 2009-08-28 | 1 | -0/+2 |
| | |||||
* | Added a default theme for the simulated S60 style | Alessandro Portale | 2009-08-28 | 4 | -3/+3 |
| | | | | Reviewed-By: Trustme | ||||
* | QMetaObjectPrivate: refactor internal disconnect to avoid duplicate code | Leonardo Sobral Cunha | 2009-08-28 | 2 | -49/+47 |
| | | | | Reviewed-by: ogoffart | ||||
* | Removing an obviously obsolete LIBS includion workaround. | Alessandro Portale | 2009-08-28 | 1 | -2/+0 |
| | | | | Reviewed-By: Trustme | ||||
* | Merge branch '4.6' | Thiago Macieira | 2009-08-28 | 70 | -728/+1438 |
|\ | |||||
| * | Mark the QSharedPointer with Qt::Uninitialized explicit | Thiago Macieira | 2009-08-28 | 2 | -1/+13 |
| | | | | | | | | | | | | | | That ensures we don't create ambiguities. QSharedPointer shouldn't have any implicit constructors. Suggested-By: Olivier Goffart | ||||
| * | Using QFocusFrame to visualize the focus. | Alessandro Portale | 2009-08-28 | 3 | -118/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the keypad navigation, the focus state of a widget is supposed to be well visible. So it makes much sense to use QFocusFrame, which is able to paint a focus marker _around_ the widget. This change should fix the issue that with some S60 themes, the focus was invisible. Also, a lot of code is removed by this change. Task-number: 256470 Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h | ||||
| * | Don't call qFuzzyIsNull on every single frame in QGraphicsOpacityEffect. | Bjørn Erik Nilsen | 2009-08-28 | 2 | -3/+10 |
| | | | | | | | | | | We only have to do it when the opacity changes (in ::setOpacity). Also, we cannot do the cut-off when the effect has an opacity mask set. | ||||
| * | Add an autotest to check QPainter rendering to a QGLPixelBuffer works | Tom Cooksey | 2009-08-28 | 1 | -0/+33 |
| | | | | | | | | Reviewed-by: Trustme | ||||
| * | Add support for setting an opacity mask on QGraphicsOpacityEffect. | Bjørn Erik Nilsen | 2009-08-28 | 4 | -6/+106 |
| | | | | | | | | | | | | | | | | Opacity masks enable you to make portions of an element transparent. More information about opacity masks here: http://msdn.microsoft.com/en-us/library/ms743320.aspx Reviewed-by: Samuel | ||||
| * | Fix wrong transform when drawing graphics item effect source. | Bjørn Erik Nilsen | 2009-08-28 | 1 | -4/+2 |
| | | | | | | | | | | We are only interested in the difference between the original transform and the transform set on the painter we're about to use. | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-08-28 | 646 | -1773/+24200 |
| |\ | |||||
| | * | Make it possible for autotests to check if JIT is enabled or not | Kent Hansen | 2009-08-28 | 3 | -10/+51 |
| | | | | | | | | | | | | | | | | | | Currently there are some differences in behavior and availability of information between the interpreter and the JIT. This is now documented as expected failures in the relevant autotests. | ||||
| | * | Re-enabled the QPixmap cleanup hooks in QPixmap destructor. | Trond Kjernåsen | 2009-08-28 | 1 | -0/+2 |
| | | | | | | | | | | | | Reviewed-by: Gunnar | ||||
| | * | Fixed QGLWidget::renderText() when using the GL 2 paint engine. | Trond Kjernåsen | 2009-08-28 | 4 | -23/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget::renderText() needs to respect the current depth and scissor tests that the user has set. Therefore we needs some special casing in the GL 2 paint engine to handle the custom depth testing. The private setRenderTextActive() has been added for this purpose. Reviewed-by: Samuel | ||||
| | * | Fixed a problem where the InvertedYBindOption was always removed. | Trond Kjernåsen | 2009-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Samuel | ||||
| | * | Enable Q_OBJECT usage across DLL boundary on Symbian OS | Shane Kearns | 2009-08-28 | 4 | -7/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian loader does not allow DLL import relocations in the data section. To workaround this, added an accessor function which can be used to get the class static metadata from the base class even if it is in another DLL. Changing the implementation for all platforms would cause a binary break, so it is only used for Symbian. The Q_NO_DATA_RELOCATION macro is used to configure this feature instead of Q_OS_SYMBIAN, because it is possible another platform may need the same fix and Symbian may eventually fix their DLL loader to support this feature. Task-number: 258893 Reviewed-by: Kent Hansen | ||||
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Janne Anttila | 2009-08-28 | 7 | -36/+46 |
| | |\ | |||||
| | | * | doc: Fixed several qdoc errors. | Martin Smith | 2009-08-28 | 1 | -2/+2 |
| | | | | |||||
| | | * | Whitespaces & indentation cleanup in qobject | Leonardo Sobral Cunha | 2009-08-28 | 2 | -26/+27 |
| | | | | | | | | | | | | | | | | Reviewed-by: trustme | ||||
| | | * | Fixed runtime warning in tst_QGraphicsProxyWidget::childPos. | Gabriel de Dietrich | 2009-08-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ungrabKeyboard was called on an item without checking whether it was a keyboard grabber. Reviewed-by: bnilsen | ||||
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-08-28 | 1 | -4/+4 |
| | | |\ | |||||
| | | | * | Added some information to QGLFramebufferObject documentation | Samuel Rødal | 2009-08-28 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond | ||||
| | | * | | Doc: Fixed the build instructions for the OCI plugin (for Oracle 10). | David Boddie | 2009-08-28 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | | | | | | | | Task-number: 234150 Reviewed-by: Trust Me | ||||
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-08-28 | 648 | -1717/+24039 |
| | | |\ | |||||
| | | * | | Doc: Added some information about the clipping applied in paint events. | David Boddie | 2009-08-28 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 203483 Reviewed-by: Trust Me | ||||
| | * | | | Added preprocess only option for createpackage.bat | Janne Anttila | 2009-08-28 | 1 | -9/+15 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | The prerocessing is needed by installer scripts. Reviewed-by: Miikka Heikkinen | ||||
| | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Janne Anttila | 2009-08-28 | 11 | -246/+439 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.5' into 4.6 | Olivier Goffart | 2009-08-28 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * | | Fixes: Crash when double-clicking a tab in a QTabBar with movable tabs | Olivier Goffart | 2009-08-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of commit 8ac7e81260 Reviewed-by: Peter Hartmann | ||||
| | | * | | | doc: Fixed several qdoc errors. | Martin Smith | 2009-08-28 | 1 | -31/+45 |
| | | | | | | |||||
| | | * | | | Add test for the styled close button | Olivier Goffart | 2009-08-28 | 1 | -0/+128 |
| | | | | | | |||||
| | | * | | | Document the fact that you can change QTabBar close button with stylesheet | Olivier Goffart | 2009-08-28 | 2 | -3/+18 |
| | | | | | | |||||
| | | * | | | Whitespaces fix | Olivier Goffart | 2009-08-28 | 2 | -195/+195 |
| | | | | | | |||||
| | | * | | | QTabBar: Add ability to change the position of the close button in the ↵ | Olivier Goffart | 2009-08-28 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheet Task-number: 241383 Reviewed-by: jbache | ||||
| | | * | | | QTabBar: Being able to change the close button appearence in the stylesheet | Olivier Goffart | 2009-08-28 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache Task-number: 241383 | ||||
| | | * | | | Ensured that the framebufferobject example has a stencil buffer. | Samuel Rødal | 2009-08-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stencil buffer is used for rasterization in the GL 2 paint engine. Reviewed-by: Trond | ||||
| | | * | | | doc: Fixed several qdoc errors. | Martin Smith | 2009-08-28 | 1 | -9/+9 |
| | | | | | | |||||
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | mread | 2009-08-28 | 589 | -1243/+21897 |
| | | |\ \ \ |