summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support overriding signal handlers in a state change.Michael Brasser2009-08-312-6/+11
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-31991-8178/+36261
|\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * trivial: make moc compile againHarald Fernengel2009-08-281-0/+2
| |
| * Warning --Alessandro Portale2009-08-281-0/+2
| |
| * Added a default theme for the simulated S60 styleAlessandro Portale2009-08-284-3/+3
| | | | | | | | Reviewed-By: Trustme
| * QMetaObjectPrivate: refactor internal disconnect to avoid duplicate codeLeonardo Sobral Cunha2009-08-282-49/+47
| | | | | | | | Reviewed-by: ogoffart
| * Removing an obviously obsolete LIBS includion workaround.Alessandro Portale2009-08-281-2/+0
| | | | | | | | Reviewed-By: Trustme
| * Merge branch '4.6'Thiago Macieira2009-08-2870-728/+1438
| |\
| | * Mark the QSharedPointer with Qt::Uninitialized explicitThiago Macieira2009-08-282-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 Portale2009-08-283-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 Nilsen2009-08-282-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 worksTom Cooksey2009-08-281-0/+33
| | | | | | | | | | | | Reviewed-by: Trustme
| | * Add support for setting an opacity mask on QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-284-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 Nilsen2009-08-281-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.6Gunnar Sletta2009-08-28646-1773/+24200
| | |\
| | | * Make it possible for autotests to check if JIT is enabled or notKent Hansen2009-08-283-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åsen2009-08-281-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| | | * Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-284-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åsen2009-08-281-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | | * Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-284-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.6Janne Anttila2009-08-287-36/+46
| | | |\
| | | | * doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+2
| | | | |
| | | | * Whitespaces & indentation cleanup in qobjectLeonardo Sobral Cunha2009-08-282-26/+27
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * Fixed runtime warning in tst_QGraphicsProxyWidget::childPos.Gabriel de Dietrich2009-08-281-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.6David Boddie2009-08-281-4/+4
| | | | |\
| | | | | * Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | | * | Doc: Fixed the build instructions for the OCI plugin (for Oracle 10).David Boddie2009-08-281-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | Task-number: 234150 Reviewed-by: Trust Me
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-28648-1717/+24039
| | | | |\
| | | | * | Doc: Added some information about the clipping applied in paint events.David Boddie2009-08-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 203483 Reviewed-by: Trust Me
| | | * | | Added preprocess only option for createpackage.batJanne Anttila2009-08-281-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.6Janne Anttila2009-08-2811-246/+439
| | | |\ \
| | | | * \ Merge branch '4.5' into 4.6Olivier Goffart2009-08-280-0/+0
| | | | |\ \
| | | | | * | Fixes: Crash when double-clicking a tab in a QTabBar with movable tabsOlivier Goffart2009-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of commit 8ac7e81260 Reviewed-by: Peter Hartmann
| | | | * | | doc: Fixed several qdoc errors.Martin Smith2009-08-281-31/+45
| | | | | | |
| | | | * | | Add test for the styled close buttonOlivier Goffart2009-08-281-0/+128
| | | | | | |
| | | | * | | Document the fact that you can change QTabBar close button with stylesheetOlivier Goffart2009-08-282-3/+18
| | | | | | |
| | | | * | | Whitespaces fixOlivier Goffart2009-08-282-195/+195
| | | | | | |
| | | | * | | QTabBar: Add ability to change the position of the close button in the ↵Olivier Goffart2009-08-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheet Task-number: 241383 Reviewed-by: jbache
| | | | * | | QTabBar: Being able to change the close button appearence in the stylesheetOlivier Goffart2009-08-281-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache Task-number: 241383
| | | | * | | Ensured that the framebufferobject example has a stencil buffer.Samuel Rødal2009-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stencil buffer is used for rasterization in the GL 2 paint engine. Reviewed-by: Trond
| | | | * | | doc: Fixed several qdoc errors.Martin Smith2009-08-281-9/+9
| | | | | | |
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6mread2009-08-28589-1243/+21897
| | | | |\ \ \
| | | | * | | | Deleting the CFontStore without a crashmread2009-08-283-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFontStore deletion crashes if there are any open fonts in it. These are now all deleted before the store is deleted. Reviewed-by: aportale
| | | | * | | | Fix for "Undefined symbol typeinfo for std::exception" in armv5 buildmread2009-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the use of QT_TRYCATCH_LEAVING, which expands to ...catch(const std::exception&)... requires access to the typeinfo for std::exception. This cannot be found in any import library (probably an OpenC defect). But this workaround creates the necessary info for the link. Otherwise this change has no effect. Reviewed-by: jbarron
| | | * | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-286-21/+16
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | doc: Fixed several qdoc errors.Martin Smith2009-08-286-21/+16
| | | | | | | |
| | | * | | | | Merge branch 'master' into 4.6Janne Anttila2009-08-2814-183/+355
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Minor fix to space usage in makefile.Janne Anttila2009-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | | | Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-284-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier createpackage required two separate parameters to define the platform and target. For example > createpackage fluidlauncher_template.pkg release armv5 Now it is changed to: > createpackage fluidlauncher_template.pkg release-armv5 This is consistent to make target what is used to do the building i.e.: > make release-armv5 The change also affected environment variables supported by 'make sisx' target. QT_SISX_PLATFORM is not any more supported, and the info is merged QT_SISX_TARGET variable. Reviewed-by: Miikka Heikkinen
| | | | * | | | Minor fix to MAKEFILE variable in SBSv2 generated makefiles.Janne Anttila2009-08-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MAKEFILE variable pointed to root bld.inf from which makefile was generated but it shoudl contain the makefile name instead. This is how it work in abld generator. Reviewed-by: TrustMe