summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-317-146/+286
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-311010-8252/+36653
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fixing layout margins for QWidgets in QFxViewThomas Hartmann2009-08-311-0/+1
| | | | | | | | | | | | Reviewed-by: Kai Koehne
| * | Revive animated zooming.Warwick Allison2009-08-316-51/+159
| | | | | | | | | | | | | | | | | | Now uses scale for transition while static uses zoomFactor. QFxPaintedItem assists by being able to freeze the cache - useful anywhere that dirty cache data is okay to use (i.e. during brief animations).
| * | Workaround possible webkit bug.Warwick Allison2009-08-311-1/+18
| | | | | | | | | | | | (discussing with Simon)
| * | Simplify zooming mechanism - put more IQ in WebView.Warwick Allison2009-08-313-111/+91
| | | | | | | | | | | | No animated zooming for now.
| * | Optimize case of cache rects needing minor repaints.Warwick Allison2009-08-312-1/+14
| | | | | | | | | | | | Especially obvious when WebView link hovered.
| * | Element-at functionalityWarwick Allison2009-08-312-0/+21
| | | | | | | | | | | | Not used yet.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-315-51/+59
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-317-7/+181
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fix flickr-mobile toolbarYann Bodson2009-08-314-49/+57
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-312-5/+39
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | doc fixYann Bodson2009-08-311-2/+2
| | | | |
* | | | | We should be using a QRectF here.Michael Brasser2009-08-311-1/+1
| |_|/ / |/| | |
* | | | Readd FocusPanel.Michael Brasser2009-08-313-0/+173
| | | |
* | | | Update XmlListModel status to be in line with other QML objects thatMichael Brasser2009-08-314-7/+8
| |/ / |/| | | | | | | | load from the network.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-312-3/+24
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-313-3/+34
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | AnchorChanges docYann Bodson2009-08-312-3/+24
| | | |
* | | | Add xml property to XmlListModel so we can set XML data directly.Michael Brasser2009-08-312-5/+39
| |/ / |/| |
* | | More robust AnchorChanges.Michael Brasser2009-08-313-3/+34
|/ / | | | | | | | | Still not completely reliable -- doesn't handle cancellations well, and checking if one Anchor change overrides another isn't reliable.
* | anchor-changesYann Bodson2009-08-311-10/+16
| |
* | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-312-6/+11
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-311-2/+4
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Support overriding signal handlers in a state change.Michael Brasser2009-08-312-6/+11
| | | |
* | | | Add anchor-changes.qml exampleYann Bodson2009-08-311-0/+36
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-31991-8178/+36261
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | 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