summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compilation with pedantic or when QtCore is not specified in the include pathOlivier Goffart2009-10-012-6/+2
| | | | | | Note that i also removed the #error since the enum is already updated in master Reviewed-by: Gabi
* Fix warnings on mingwThierry Bastian2009-10-014-2/+6
| | | | Reviewed-by: trust me
* Split EGL config selection & surface creation into seperate functionsTom Cooksey2009-10-013-73/+105
| | | | | This is needed to implement render-to-pixmap on x11/EGL, which will also need to create an EGL surface for pixmaps.
* Add support for modality to QGraphicsItem panels.Bradley T. Hughes2009-10-016-25/+1314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add QGraphicsItem::setPanelModality(), panelModality(), isBlockedByModalPanel() and the QGraphicsItem::PanelModality enum (enumerators are either SceneModal, PanelModal, or NonModal, which mirror Qt::ApplicationModal, Qt::WindowModal, and Qt::NonModal). Reviewed-by: ahanssen Squashed commit of the following: commit a980a1b9c2972c676f3a70e8577d4eace54a25b3 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 30 14:42:01 2009 +0200 Fix tst_QGraphicsItem::modality_hover() test failures As pointed out by Andreas, QGraphicsScenePrivate::dispatchHoverEvent() already has all the logic needed to correctly dispatch the hover events when changing modality. All we need to do is store the last known mouse position, and call dispatchHoverEvent() when entering, changing, and leaving the modal state. commit ba41633c96ece8da3a8bbf9c7491c15b14f83f76 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 30 14:40:59 2009 +0200 Fix tst_QGraphicsItem::mixedModality() failure When changing modality from SceneModal to PanelModal, we may need to send WindowUnblocked events in addition to the WindowBlocked events. commit d1076e315de10b1b2fb7617ebaee552c14e49c8b Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 30 14:33:21 2009 +0200 Update the expected events counts in tst_QGraphicsItem::modality_hover() HoverEnter and HoverMove always come in pairs, and should do so when entering or leaving modality as well. This means though that changing modality can cause spurious HoverMove events (as seen in this test). commit a29b098e4c391651ef61dd4714a66b22654e4628 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 30 14:20:25 2009 +0200 Update tst_QGraphicsItem::mixedModality() to do more detailed checking The test looks for unwanted WindowBlocked/WindowUnblocked events now, making it easier to spot where the failure comes from. commit c1ae96126ed01d0e662bddf38ff161e50a804b1c Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Tue Sep 29 12:17:17 2009 +0200 Documentation for QGraphicsItem::PanelModality Document the behavior of the QGraphicsItem::NonModal, PanelModal, and SceneModal enumerators. Corrected a qdoc error in the isBlockedByModalPanel() documentation commit 02fec999e660180ff65bbbf79c8085e582879ed1 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Thu Sep 17 10:31:44 2009 +0200 Add bool QGraphicsItem::isBlockedByModalPanel() This function can be used to figure out 1) if an item is modally shadowed and 2) which panel is blocking the item in question. This will make it possible to implement window-manager like behavior of activating/highlighting/animating modal panels when the user tries to interact with a blocked item (this will most likely need to be done by reimplementing QGraphicsScene::event()). commit eab9a975dcd71b68135325d479374108bd7f3b2a Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 16 14:38:55 2009 +0200 Block key events to the focus item if it is blocked by a modal panel. We don't want the event to propagate either, just stop propagating once we reach an item that is blocked. commit 038b61a10bb837b353f988cb0d1665dd53656cdb Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Tue Sep 15 12:40:27 2009 +0200 Add a test for click-to-focus behavior in the presence of modality Clicking on a widget should neither give it focus nor set it as the sub-focus item. commit 3bb3662556efe8d76af5a56e65b1df7a9f4b476a Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Tue Sep 8 09:08:42 2009 +0200 Newly blocked QGraphicsItem panels should lose implicit grabs when modality is enabled. If an item has an implicit grab when blocked by a modal panel, this grab is lost and no mouse events are sent until the mouse is released and re- commit 3be51be3da36e782a5a1f282c552064d5d490a71 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Thu Sep 3 13:39:14 2009 +0200 Support changing modality from PanelModal to SceneModal or vice-versa Don't leave modality first, and then re-enter... this sends unnecessary events. commit bb0aea559ba01a8bbb03c0370a247ab902f561f5 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 2 16:58:23 2009 +0200 Fix hover event delivery in the presence of modal panels Panels that are modally shadowed should not get hover events. When entering and leaving the modal state, GraphicsSceneHoverEnter and GraphicsSceneHoverLeave event should be send to the widgets that become or are no longer blocked. Auto-test included. commit cad00b1d9da19565e2d7ea2d30d37eb45005b5ae Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 2 10:45:20 2009 +0200 Fix tst_QGraphicsItem::modality_hover() test Don't send hover events to items that are modally shadowed. commit ae15df331901110e19eb2037f37ff7f84cd7cd16 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Wed Sep 2 10:44:14 2009 +0200 Enable the ItemIsPanel flag in the modality_hover() test Otherwise the modality settings are ignored. commit 1580f43c8feabc3a2bf9c1450e1a8916e8940a4c Author: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> Date: Fri Aug 28 15:20:37 2009 +0200 More work on QGraphicsItem::PanelModality. Added many tests. commit ed2064ad2ec8bc06d62cf1e931b973d5d92c0563 Author: Bradley T. Hughes <bradley.hughes@nokia.com> Date: Thu Aug 27 13:45:11 2009 +0200 Add support for modality to QGraphicsItem panels. This add QGraphicsItem::setPanelModality() and the QGraphicsItem::PanelModality enum (enumerators are either SceneModal, PanelModal, or NonModal, which mirror Qt::ApplicationModal, Qt::WindowModal, and Qt::NonModal). Reviewed-by: ahanssen
* Stabilize tests on X11Olivier Goffart2009-10-016-5/+9
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-011-1/+1
|\
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-014-2/+125
| |\
| * | Made qpluginbase.pri include properly relative to s60pluginbase.priMiikka Heikkinen2009-10-011-1/+1
| | | | | | | | | | | | | | | | | | Previously, include was relative to each version plugin's .pro file. Reviewed-by: axis
* | | QGLContext::areSharing() to check for GL share relationshipsRhys Weatherley2009-10-017-40/+50
| |/ |/| | | | | Reviewed-by: Samuel
* | Compile fix for pbuffers under LinuxRhys Weatherley2009-10-012-1/+2
| | | | | | | | Reviewed-by: Sarah Smith
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-019-178/+653
|\ \ | |/
| * Fix qwidget auto test failing to build on OSX/carbon.Justin McPherson2009-10-011-2/+2
| | | | | | | | Reviewed-by: Sarah Smith
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-10-013-13/+7
| |\
| | * Revert "qmake - add error message if files for deployment are missing"Joerg Bornemann2009-10-011-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45. Using wildcards in the DEPLOYMENT variable like in tests/auto/qpixmap/qpixmap.pro was completely broken. Additional gimmick: replaced hand-crafted string chopping with QString::chop(1).
| * | Remove display lists and refactor ready for ES/ES2 portSarah Smith2009-10-017-168/+649
| | | | | | | | | | | | | | | | | | | | | | | | | | | Display lists, and a few other features dont work in ES/ES2. Refaoctor to allow redo of lighting and other non-fixed-function pipeline features. Also use QAnimation* classes instead of timers, and correct a few minor bugs (flipped texture). Include new screenshot (old one manifested bug). Reviewed-by: Rhys Weatherley
* | | Add unit tests for QGLShareRegisterRhys Weatherley2009-10-012-1/+123
| |/ |/| | | | | Reviewed-by: Sarah Smith
* | Use QGLSharedResourceGuard to track contexts in the shader managerRhys Weatherley2009-10-012-5/+5
|/ | | | Reviewed-by: Sarah Smith
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-014-59/+67
|\
| * Fix a window opacity bug with DirectFBAnders Bakken2009-10-012-52/+60
| | | | | | | | | | | | | | | | | | Initialize IDirectFBWindows with the correct capabilities/options when supporting top level transparency. Also, properly deal with runtime changes of top level transparency. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Make sure gccaps is properly initialized for dfbpeAnders Bakken2009-10-011-0/+2
| | | | | | | | Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Clean up releaseSurface in QDirectFBPaintDeviceAnders Bakken2009-10-012-7/+5
| | | | | | | | | | | | | | | | Instead of having to call unlockSurface/releaseSubSurface and releaseSurface to release the surface in QDirectFBWindowSurface make releaseSurface do all three things. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Make QGLFramebufferObject crash-proof if QGLContext destroyed firstRhys Weatherley2009-10-013-26/+67
|/ | | | | | | | | | | | | | | | Sometimes it isn't possible to arrange for the QGLFramebufferObject to be destroyed before the QGLContext group in which it was created. Especially during application shutdown or in applications with multiple shared contexts. This change modifies QGLFramebufferObject to use QGLSharedResourceGuard, which ensures that when the last QGLContext in a sharing group is destroyed, any remaining FBO's will revert to !isValid(). It is now safe to destroy the context before the FBO, or the FBO before the context. Unit test included. Reviewed-by: Sarah Smith
* Stabilize tests on X11Olivier Goffart2009-09-304-37/+45
|
* Simplify code of states exampleThierry Bastian2009-09-301-42/+40
| | | | We're not using QGraphicsWidget any more
* Avoid warnings in the states exampleThierry Bastian2009-09-301-72/+63
| | | | We now have the animations directly added to the transition
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-301-4/+11
|\
| * Fix locale encoding in XLIFF filesAndy Shaw2009-09-301-4/+11
| | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi
* | Revert "Make the test fail, not crash for now. A task is already open to fix ↵Peter Hartmann2009-09-301-2/+1
| | | | | | | | | | | | | | | | | | | | it." This reverts commit 21cfe5bf6550ae359d6bfa937b1308891954e9bb. The bug is fixed now. Reviewed-By: Alexis
* | optimize read() and readAll()Oswald Buddenhagen2009-09-301-20/+24
| | | | | | | | | | | | | | | | factor out a dedicated private::read() function based on private::scan(). this avoids making the latter even more complex in the process of optimizing it. Reviewed-By: mariusSO
* | optimize scan()Oswald Buddenhagen2009-09-301-2/+1
| | | | | | | | | | | | lastChar needs to be set only when in line mode Reviewed-By: mariusSO
* | improve condition nestingOswald Buddenhagen2009-09-301-11/+23
| | | | | | | | | | | | | | compilers might or might not have been clever enough to optimize it. better safe than sorry. Reviewed-By: mariusSO
* | Cleaning up usage of examples/{examplebase,symbianpkgrules}.priJoão Abecasis2009-09-3017-35/+1
| | | | | | | | | | | | | | | | | | | | examplebase.pri was renamed to symbianpkgrules, but some project files were not updated to reflect the change. Since it doesn't make sense to have this in non-portable examples, the include is removed in those cases. Reviewed-by: Espen Riskedal
* | QDom: set the codec to UTF-8 if codec not present or unknownPeter Hartmann2009-09-301-8/+9
| | | | | | | | | | | | | | | | we were trying to get a codec even for unknown names. Now, we always set the codec to UTF8 if the field is not present or we do not know the codec. Reviewed-by: Paul
* | Google Chat example: always bail out if SSL not availablePeter Hartmann2009-09-301-5/+5
| | | | | | | | Reviewed-by: Simon Hausmann
* | Revert "Google Chat example: state that SSL is required"Peter Hartmann2009-09-301-15/+0
| | | | | | | | | | | | | | This reverts commit 59623e45ee31892c9ef210f8d7e396ccb0fe31a5. A fix for the same problem had been pushed by Simon shortly before that one.
* | Doc: Remaining pieces of the Graphics effect documentation.Bjørn Erik Nilsen2009-09-302-0/+34
| |
* | Added QGraphicsBloomEffect::blurHint.Bjørn Erik Nilsen2009-09-302-0/+38
| | | | | | | | | | | | | | This allows the user to control whether to use a fast dynamic blur or a static high quality blur. Reviewed-by: Samuel
* | Add Qt::RenderHint to control rendering operations.Bjørn Erik Nilsen2009-09-307-54/+50
| | | | | | | | | | | | | | | | | | | | | | We need a way to control various rendering operations. For example, whether quality is more important than performance, or the other way around. This change also replaces occurences of QPixmapFilter/QGraphicsEffect::BlurHint (introduced in 1a431e850893b6b162c833f4f148f090e2427dda) with Qt::RenderHint. Reviewed-by: Samuel
* | Readd QGraphicsBloomEffect.Bjørn Erik Nilsen2009-09-305-0/+224
| | | | | | | | | | | | | | | | This effect was removed in 1c9a28ea64cc53e61a64644dc5a4ff121b475bc5, but has now been readded on request from a couple of customers. Andreas also agreed we should provide this effect. Reviewed-by: Andreas
* | Compilation fix for tests thas doesn't include qapplication.hOlivier Goffart2009-09-301-1/+1
| |
* | Make sure to process the events in QTest::qWaitForWindowShown on X11Olivier Goffart2009-09-301-0/+1
| | | | | | | | | | | | qt_x11_wait_for_window_manager doesn't necesserly process the events Reviewed-by: Denis
* | Make it possible to debug JSC in the Symbian emulator.Janne Koskinen2009-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | Cherry-picked-by: Simon Hausmann http://trac.webkit.org/changeset/48928 This is not a perfect fix, it requires more fine tuning. But this makes it possible again to debug in the emulator, which is more important in order to be able to fix other run-time issues.
* | Merge branch 'focusFixes' into 4.6axis2009-09-309-74/+80
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp
| * | Fixed some focus issues on Symbian.axis2009-09-303-18/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are really two bugs that are fixed in this commit: - SetFocus() in Symbian does not automatically clear focus on the previously focused control, so we have to remember that control and clear it ourselves. - Symbian assumes that it is always the control at the top of the control stack that should have focus, and if this isn't the case, focus may or may not work depending on whether Symbian has had a chance to reset the focus or not. Therefore, whenever we change focus on a control, we have to also readd that control to the top of the stack, to ensure that it stays focused. RevBy: Janne Anttila
| * | Fixed some uncommon codepaths to compile.axis2009-09-301-2/+2
| | | | | | | | | | | | RevBy: Trust me
| * | Avoided qt3support constructor (S60 port doesn't have it).axis2009-09-301-1/+1
| | | | | | | | | | | | RevBy: Paul Olav Tvete
| * | Helped out the Symbian compiler to avoid build error.axis2009-09-301-4/+4
| | | | | | | | | | | | RevBy: Trust me
| * | Revert "Switched to asynchronous focus handling on Symbian."axis2009-09-307-52/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6377f43410b14125a66ffd02acde69cfb6e455e. The asynchronous handling caused too many headaches with input methods, which expect the focus status to be updated immediately. This may break the test case that was originally fixed by this patch (I cannot find out which one at the moment), but that will have to be solved in a different way. Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp
* | | Moving some QVFB stuff out of the configure script and into .pro filesJoão Abecasis2009-09-303-21/+12
| | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
* | | Stabilize more test on X11Olivier Goffart2009-09-306-110/+108
| | | | | | | | | | | | Each times the test are run, pulse show different failures.
generated by cgit v0.12 at 2024-10-25 09:20:13 (GMT)