summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-015-21/+66
|\ | | | | | | kinetic-declarativeui
| * Rewrite of DirectFB locking mechanismAnders Bakken2009-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB allows you to have a locked subSurface that remains valid while you paint on the unlocked "parent" surface. The only limitation is that when accessing the locked memory you might have to call DirectFB->WaitIdle() in case pending GPU operations aren't finished. After this we keep the locked surface around at all times (from the first time it's requested) until the surface dies. Previous calls to lock() will just call WaitIdle if necessary and previous calls to unlock now just mark the surface as dirty and in need of a WaitIdle if someone needs to access its pixel data. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Add DirectFB to QScreenDriverFactoryAnders Bakken2009-09-011-2/+7
| | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Add directfb.pri to embedded.priAnders Bakken2009-09-011-0/+4
| | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Copy directfb.pro to src/gui/embedded/directfb.priAnders Bakken2009-09-011-0/+38
| | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Doc: Fixed typos in QGraphicsItem and Diagram Scene ExampleGeir Vattekar2009-09-011-14/+13
| | | | | | | | | | Task-number: 257292 Reviewed-by: Trust Me
| * Doc: Fixed outdated docs in QStyle::styleHint().Geir Vattekar2009-09-011-5/+3
| | | | | | | | | | Task-number: 256745 Reviewed-by: Trust Me
* | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0116-169/+348
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/classic.css
| * QTreeView: exapnding nodes just after replacing the model wouldn't workThierry Bastian2009-09-012-3/+15
| | | | | | | | | | | | | | | | | | | | | | The problem is that deleting the previous model would triggera delayed reset. This reset could happen after the model has changed and nodes are expanded. We can now cancel a reset when reset is called from another place (like when we set a new model). Note: autotest included Task-number: 245654 Reviewed-by: ogoffart
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-017-18/+31
| |\
| | * Fix rounding bug in QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-09-011-4/+5
| | | | | | | | | | | | The pixmap was painted at wrong offset.
| | * Make sure the BSP is updated when a graphics effect changes bounding rect.Bjørn Erik Nilsen2009-09-014-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of applying an effect to a QGraphicsItem, we have to notify the scene's BSP that the item's bounding rect has changed. We do this by calling prepareGeometryChange(). In the case of QWidget, it's sub-optimal that we update its parent, but there's no other way to solve it at the moment.
| | * Fix reversed progress bars on VistaJens Bache-Wiig2009-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This issue seems to be caused by change a6782030 and was caused by incorrectly applying paranthesis to the expression. Task-number: 259515 Reviewed-by: joao
| | * Make QIconloader use resource directory as fallbackJens Bache-Wiig2009-08-112-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using different paths on Mac and Windows we now simply use ":\icons" on all platforms. It is a little more effort to create resources but it is certainly the Qt way to do it. :) Reviewed-by: ogoffart
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-0119-365/+616
| |\ \ | | |/
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Geir Vattekar2009-09-012-2/+61
| | |\
| | | * QGraphicsDropShadowEffect convenience; setXOffset() and setYOffset().Bjørn Erik Nilsen2009-09-012-1/+37
| | | | | | | | | | | | | | | | Reviewed-by: Andreas
| | | * Make sure graphics effects updates properly when changing their properties.Bjørn Erik Nilsen2009-09-012-1/+24
| | | | | | | | | | | | | | | | Reviewed-by: Leo
| | * | Doc: Said what happens when setFocus() is called on a widget in anGeir Vattekar2009-09-011-0/+2
| | |/ | | | | | | | | | | | | | | | | | | inactive window. Task-number: 78707 Reviewed-by: Morten Engvoldsen
| | * Microoptimizations in QCleanLooksStyleThorbjørn Lindeijer2009-09-011-140/+224
| | | | | | | | | | | | | | | | | | Shaved 4K off the size of a release build of libQtGui. Reviewed-by: Jens Bache-Wiig
| | * doc: Also mention HSLThorbjørn Lindeijer2009-09-011-1/+1
| | |
| | * Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-09-012-54/+61
| | |\
| | | * Added description of visualIndex condition to docs for logicalIndex()Peter Yard2009-09-011-1/+3
| | | | | | | | | | | | | | | | Fix for task: 214373
| | * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-0/+6
| | |\ \
| | | * | Don't crash when convert Indexed8 without colortable to QPixmapGunnar Sletta2009-08-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implicitly adds "grayscale" support for indexed 8, but only for the conversion. The alternative would be leave the pixels uninitialized which would be less nice... Reviewed-by: Samuel
| | | * | Invalidate cached QVectorPath when QPainterPath changesGunnar Sletta2009-08-311-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | Doc: Fixed broken links to renamed functions.David Boddie2009-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-311088-14393/+14572
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * | | | Disable event compression when the tablet events are acceptedBenjamin Poulain2009-08-311-53/+58
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 4.5, all tablet events are compressed not to overload the widgets with the corresponding mouse event (a mouse event is generated if the tablet event is not accepted). This behavior reduce the precision when drawing on a widget that use the tablet events. All tablet events should be sent to the widget that are accepting the tablet event. With this patch, the tablet event are filtered only if the widget ignore the first tablet event. The mouse events are compressed. There is two special cases for the filtering: First, if a tablet event is for another widget than the one ignoring the tablet, this event should not be filtered. Second, if there is a mouse press event, the mouse move event should be sent to the widget that received the mouse press event. Helped-by: Pierre Rossi Reviewed-by: Thomas Zander Reviewed-by: Bradley T. Hughes
| * | | Adapt to libpng 1.4.0beta74 API changeBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From libpng changelog: version 1.4.0beta74 [August 8, 2009] Changed png_ptr and info_ptr member "trans" to "trans_alpha". Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Qt fails to build with libpng 1.4 betasBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt expects a trans_values member in png_info_struct; this member has been renamed to trans_color in libpng 1.4. Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | fix doc. id maps to QObject::objectName, not QGraphicsObject::setOpacity ;-)Riccardo Iaconelli2009-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Riccardo Iaconelli <riccardo@kde.org> Merge-request: 1371 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Make QMargins a proper classJens Bache-Wiig2009-08-314-99/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we need QMargins for other things then the CSS helper functions in drawutil, we have to make it more generic. It is already useful for QWidget::contentsMargins for example. This ensures we have some flexibility on how to use and modify it in the future. Reviewed-by: mbm
| * | | Add auto-activation on show/hide and setParentItem().Andreas Aardal Hanssen2009-08-313-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you show a child panel of an active panel, the child will now be activated and the parent deactivated. Hiding the child panel will reactive the parent. If the parent is 0, no other panel is activated. Reparenting a panel onto an active panel will also activate the (new) child. Reparenting away does not affect activation in any way. This change also fixes QGraphicsWidget::isActiveWindow(), which returned true for all toplevel widgets (not in a panel/window). This is wrong; either the non-panel items are active, or a panel is active. The correct behavior is the same as calling QGraphicsItem::isActive(). Fixed the autotests (which wrongly tested that both a panel and a non-panel item were active at the same time). This change causes popups (QGraphics{Proxy,}Widget) to deactivate the parent widget. On the positive side this activates the popup, and ensures that the parent regains proper focus when the popup is closed. However it also means the parent widget is inactive while the popup is open, which (e.g.) causes editable combobox line edit cursors to stop blinking. This is to be fixed soon, but the fix is a bit big so we'll do that later. Autotests included. Reviewed-by: Brad
| * | | Fix activation behavior for panels, and add QGraphicsItem::setActive().Andreas Aardal Hanssen2009-08-315-61/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow delayed activation for more fine grained control over which panels are activated or left inactive when the scene is created. Autotests included. Reviewed-by: Brad
| * | | doc: Fixed several qdoc errors.Martin Smith2009-08-311-1/+1
| |/ /
| * | doc: Fixed several qdoc errors.Martin Smith2009-08-312-2/+4
| | |
| * | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-31112-1456/+1456
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | doc: Fixed several qdoc errors.Martin Smith2009-08-311-12/+48
| | |
| * | Fixed performance issue with graphics effects on graphics items.Samuel Rødal2009-08-311-0/+2
| | | | | | | | | | | | | | | | | | | | | Prevent a deep copy of the pixmap by ending the painter before returning the pixmap. Reviewed-by: Bjørn Erik Nilsen
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-31976-12688/+12688
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| | * Update tech preview license header.Jason McDonald2009-08-31979-12727/+12727
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * 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-314-13/+55
| | |
| * | Added QContextMenuEvent sending to widget in Symbian.Janne Anttila2009-08-311-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
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-31101-767/+1552
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp
| * | Warning --Alessandro Portale2009-08-281-0/+2
| | |
| * | Added a default theme for the simulated S60 styleAlessandro Portale2009-08-284-3/+3
| | | | | | | | | | | | Reviewed-By: Trustme
| * | Removing an obviously obsolete LIBS includion workaround.Alessandro Portale2009-08-281-2/+0
| | | | | | | | | | | | Reviewed-By: Trustme
| * | 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