summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicswidget
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Mark tst_qgraphicswidget as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ie658d90cbc9eb2b68a963b1f1de06ca37f44047e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: allow unstable tests to be marked with CONFIG+=insignificant_testSergio Ahumada2011-12-281-1/+1
| | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a Reviewed-by: Jo Asplin
* QGraphicsWidget::setLayoutDirection doesn't propagate to new childrenJohn Tapsell2011-09-161-3/+50
| | | | | Merge-request: 1360 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Doc: Fixing typoSergio Ahumada2011-06-301-2/+2
|
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-04-281-41/+0
| | | | | | | | | | | (It did not really fix the issue.) This reverts commit 33f525e636ef8fa64a15d3e66c56adaea0075bda. Conflicts: src/gui/graphicsview/qgraphicslinearlayout.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
* Update copyright year to 2011.Jason McDonald2011-01-111-1/+1
| | | | Reviewed-by: Trust Me
* Fixed QGraphicsWidget autotest to use PlatformQuirks.Dominik Holland2010-11-021-2/+13
|
* FocusOut even when QGraphicsItem gets hidden.Frederik Gladhorn2010-10-011-0/+34
| | | | | | | | If a parent QGraphicsItem becomes invisible, its child would not receive a focus out event. Review-by: Thierry Task-number: QTBUG-13916
* Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItemBjørn Erik Nilsen2010-09-301-0/+1
|
* Fix double painting when adding an item into a linear layoutThierry Bastian2010-09-291-0/+40
| | | | | | | | | | the problem was that the item is first painted at its default position, then moved by the layout and finally repainted. We now made sure the item is laid out before the first paint event occurs. Task-number: QTBUG-13865 Reviewed-by: bnilsen
* Make sure propagated font in QGraphicsWidget can be set on a QPainterEskil Abrahamsen Blomfeldt2010-08-271-1/+194
| | | | | | | | | | | | | | | | | | | | | In QWidget and QGraphicsWidget, propagating fonts blank out the resolve mask, mainly to help in determining inheritance. This means that when the font is set on a QPainter with device and therefore resolved against the device font, none of the attributes in the font will take presedence and the font will essentially just be ignored. For QWidgets this has not been a problem due to the fact that the painter is opened on the widget, getting the propagated font as its device font. For QGraphicsWidget, however, the QPainter is opened on the viewport and the viewport's font will therefore override the propagated font when it's passed into setFont(). To fix this, we need the font returned by QGraphicsWidget::font() to contain the resolve mask of the inherited parts of its font as well. This is done last minute to avoid messing up the rules of inheritance in the QGraphicsWidget tree (problem arises e.g. in hierarchy A -> B -> C and a font is set on B which should override the font C has previously inherited from A.) Task-number: QTBUG-13188 Reviewed-by: Lars
* Fixed autotest compilation issue on solarisThierry Bastian2010-08-191-6/+6
| | | | Task-number: QTBUG-12991
* Properly emit geometryChanged() when the position change.Alexis Menard2010-08-121-1/+19
| | | | | | | Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann
* Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-131-0/+20
| | | | | | | | | | | | | Crashed because tabFocusFirst could end up being a dangling pointer when removing an item from the scene before deleting it. When setting tabFocusFirst in fixFocusChainBeforeReparenting, we now check that the item is in the scene. If it is not, tabFocusFirst is set to 0. Autotest included. Task-number: QTBUG-12056 Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-0/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * QGraphicsWidget was not working properly when ItemSendsPositionChanges is falseAlexis Menard2010-05-061-0/+29
| | | | | | | | | | | | | | | | | | | | | | The geometry was not properly set because QGraphicsWidget rely on itemChange to update its own geometry. Now when calling setPos we also ensure that for a widget the geometry will be up to date. Setting the flag ItemSendsPositionChanges to false for a given widget will give a small performance boost. Reviewed-by:janarve Reviewed-by:bnilsen
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-0/+86
|\| | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * Fixes CursorChange and TooltipChange events delivery for QGraphicsWidgetYoann Lopes2010-04-071-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | As the documentation mentions, these two events are delivered respectively after the cursor has changed and after the tooltip has changed. These two events were previously delivered just before. This patch is needed for fixing QTBUG-5349 even if it is not directly related. Auto-test included. Reviewed-by: bnilsen
* | Revert 4.6 commits that shouldn't be in 4.7.Thiago Macieira2010-03-311-2/+33
| | | | | | | | | | | | | | | | | | Commits reverted: 880e4935410769b8337d75f219bef70493c4bb2c 82a306e7dda06909801f576bbbbebb59dc41c563 6cb935dd89a391f792f8ad42012b5c7c38712f17 ebd1c45822aca087be994c898cfb01cd41599429 4e4c0055d59978850796ff8c1b5015e17459e8d2
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-31/+1
|\| | | | | | | | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * Revert "Add a children private property needed for QML to support ↵Alexis Menard2010-03-311-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject" This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drops the support of QML on top of 4.6
| * Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-311-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drop the support of QML on top of 4.6
| * Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry ↵Alexis Menard2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | changes" This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp Drop the support of QML on top of 4.6
| * Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-311-2/+1
| | | | | | | | | | | | This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311. This drop the support of QML on top of 4.6
| * Add a a layout property in QGraphicsWidget.Alexis Menard2010-03-301-1/+2
| | | | | | | | Reviewed-by:michael brasser
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+28
|\| | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Add a children private property needed for QML to support QGraphicsObjectAlexis Menard2010-03-241-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit adds a private property that QML can use to add children for a given item. This is a custom list that calls a callback which actually reparent the item instead of just appending in the list (otherwise it will mess up the state of QGraphicsView). This is needed because childItems() is pretty useless you get a list but if you append something on it then it adds that into a copy. Also the children property is the default property a concept used by QML. Width and Height private properties has been added in order to support better the integration with QGraphicsWidget in QML. The actual implementation is in the private class of QGI and QGraphicsWidget reimplements it to return the geometry. (In 4.7 QDeclarativeItem reimplements it too). This change should be harmless everything is private. Task-number:QT-2757 Reviewed-by:andreas
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-86/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Better handling for NOTIFY in QGraphicsWidget regarding geometry changesAlexis Menard2010-03-191-1/+1
| | | | | | | | | | | | We bundle the size and the geometry into the same NOTIFY signal. Reviewed-by:akennedy
| * Add NOTIFY to size property so QML bindings are working fine.Alexis Menard2010-03-191-1/+3
| | | | | | | | | | | | | | Just add the notify + the signal. Task-number:QTBUG-8277 Reviewed-by:yoann
| * Fixed stability issues in qgraphicswidget testsToby Tomkins2010-03-181-85/+47
| | | | | | | | | | | | Remove qWait functions as it is used in QTRY_* macros. Reviewed-by: rohan mcgovern
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-0/+43
|\| | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"Bjørn Erik Nilsen2010-02-041-4/+2
| | | | | | | | | | Commit: 555d5b7a87b8c3a2f207c93c7eda30892de5ecc6 We also have to do the same for the "dummyView".
| * Changed qgraphicswidget autotest to use qWaitForWindowShown.Denis Dzyubenko2010-02-041-4/+2
| | | | | | | | | | | | Make use of (yet another time) improved QTest::qWaitForWindowShown. Reviewed-by: trustme
| * Stabilize tst_QGraphicsWidget::initialShow2 (new test)Bjørn Erik Nilsen2010-02-041-1/+21
| |
| * QGraphicsWidget is painted twice on the first show.Bjørn Erik Nilsen2010-02-031-0/+27
| | | | | | | | | | | | | | | | | | | | | | We want to discard all update requests when we there's a full update pending. The problem was that 'updateAll' was reset too early causing update requests to fall through. To prevent this from happening we reset 'updateAll' right before the items are actually painted. Auto-test included. Task-number: QTBUG-6956
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-0/+25
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-221-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
* | Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Update copyright year to 2010Jason McDonald2010-01-071-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-0/+32
|\| | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * Fix a crash on the focus chain when removing items from the scene.Alexis Menard2009-12-091-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was because of the dangling pointer set on the tabFocusFirst attribute in QGraphicsScene. A child which was the tabFocusFirst was removed from the scene and fixFocusChainBeforeReparenting was setting the new tabFocusFirst pointer to the parent (since in that example it was the focusNext) but later on the parent was removed also from the scene (due to the recursion of removeItem if you call it with the parent : first children, then the parent itself) and fixFocusChainBeforeReparenting was not called again so if you delete the parent then the scene has the dangling pointer set. Task-number:QTBUG-6544 Reviewed-by:janarve
* | Added QGraphicsWidget::autoFillBackground property.J-P Nurmi2009-12-031-0/+27
|/ | | | | | | | This add a property to QGraphicsWidget to fill its background. QWidget has the same. Merge-Request: 1656 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* Only call updateFont if the font have changed.Alexis Menard2009-11-301-0/+35
| | | | | | | | | When receiving the polish event, we call updateFont only if the font has changed (from the QApplication::font()). This avoid to clear sizeHints cache. Task-number:QTBUG-6272 Reviewed-by:janarve
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:08:40 +0000