summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Renamed the QML front-end.Roberto Raggi2009-06-1129-406/+407
|
* make the setRotation code a little more efficientLars Knoll2009-06-111-3/+2
| | | | | | This doesn't give us much. The real fix here is to add support for rotation and transformationOrigin to QGraphicsItem.
* Introduce QGraphicsItem::ItemHasNoContents.Andreas Aardal Hanssen2009-06-111-0/+4
| | | | | | | | | | | This flag helps optimize the case where an item is used only as a transformation node in a scene graph, and where the item itself doesn't paint anything. This is the default for FxItem (the subclasses that do paint enable the HasContents flag). This lets Graphics View know whether there's any point in setting up the world transform, opacity and other things. Reviewed-by: Lars
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-11108-2018/+2662
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * typo in my recent changeWarwick Allison2009-06-101-1/+1
| |
| * Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-1096-2005/+2571
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| | * QPainter::worldTransform() does not return identity matrix.Bjørn Erik Nilsen2009-06-103-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPainter::worldTransform() does not return identity matrix when created on a redirected widget. It should always be identity by default, and should only change as a result of QPainter::setWorldTransform. The reason it didn't return identity for redirected widgets, was that we translated the shared painter's world matrix directly. Since we cannot modify the world matrix directly, we have to store the shared painter's current world transform in a separate matrix (redirectedMatrix), reset the world transform to identity, and later combine the redirectedMatrix with world transforms set on the painter. Note that redirection_offset was in negative coordinates before, and that redirectionMatrix now is in positive coordinates, hence opposite signs around. Auto-test included. Reviewed-by: lars Reviewed-by: Samuel
| | * Merge commit 'qt-mainline/master' into master-recursivepaintAndreas Aardal Hanssen2009-06-1016-157/+233
| | |\
| | | * Internal documentation for QAbstractItemModelPrivate::canConvertToDoubleOlivier Goffart2009-06-101-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Also add QMetaType types as list or recognized numerical types Reviewed-by: thierry
| | | * Made QListWidgetItem::operator<() check if the data is numerical when comparing.J-P Nurmi2009-06-101-1/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 631 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * Added QAbstractItemModelPrivate::canConvertToDouble().J-P Nurmi2009-06-106-45/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And changed QTreeWidgetItem::operator<() and QTableWidgetItem::operator<() to use it Merge-request: 631 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * Compile with debug enabledOlivier Goffart2009-06-101-1/+1
| | | |
| | | * Avoid locking and search on the global hash if there is no QPointerOlivier Goffart2009-06-102-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As less than 10% of the object have QPointers, we can avoid locking if we know there is no QPointer. And keeping track of which object has a QPointer is easy. Reviewed-by: Brad
| | | * Use a linked list for the senders list inside QObjectOlivier Goffart2009-06-102-32/+40
| | | | | | | | | | | | | | | | | | | | | | | | Speed up the disconnection and object destruction Reviewed-by: Brad
| | | * Move declaration of QFileInfoPrivate in a separate file _p andAlexis Menard2009-06-103-64/+128
| | | | | | | | | | | | | | | | | | | | | | | | add an auto-test when we copy file infos. Reviewed-by: ogoffart
| | | * Fix some possible double connected signalsOlivier Goffart2009-06-103-11/+6
| | | | | | | | | | | | | | | | | | | | Task-number: 250147 Reviewed-by: Thierry
| | * | Revert "greatly speed up QTransform::mapRect() for projective transforms"Andreas Aardal Hanssen2009-06-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72e083c98c3adb07bb1578fb7f28f121fc3f34ac. This test broke the tst_QTransform::projectivePathMapping autotest. Lars is looking into it; for now we take the patch out. Reviewed-by: Lars
| | * | Merge commit 'qt-mainline/master' into master-recursivepaintAndreas Aardal Hanssen2009-06-1063-462/+887
| | |\ \ | | | |/
| | | * add some api docs to clarify what collate doesThomas Zander2009-06-101-0/+3
| | | |
| | | * small code cleanup that improves some loopsThierry Bastian2009-06-109-28/+43
| | | | | | | | | | | | | | | | it uses les foreach
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-06-101-2/+2
| | | |\
| | | | * Fixed clipping bug in raster paint engine causing rendering artifacts.Samuel Rødal2009-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The artifacts were visible in the mainwindow demo when dragging the top toolbar separator left and right. We need to check that rect clipping is actually activated before we compare the new clip rect with the old, otherwise the clip type and clip bound flags won't get updated.
| | | * | Fix some incorrect license headers.Jason McDonald2009-06-1012-12/+12
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | The MODULE placeholder shouldn't be used anymore, and neither should the old Trolltech license header. Reviewed-by: Trust Me
| | | * Fix license headers for QStringBuilder.Jason McDonald2009-06-102-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only release branches are allowed to have the Commercial usage header. All other branches must have the No Commercial Usage header. Reviewed-by: Trust Me
| | | * Opening links with cyrillic file names does not work in QLabel.Prasanth Ullattil2009-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDestopServices was converting the file names to percentage encoding before calling ShellExecute. This will not work with URLs without a scheme. These are now being treated similar to a file. Task-number: 254501 Reviewed-by: Jens Bache-Wiig
| | | * Add support for TIFF formats (Mono and indexed)Benjamin Poulain2009-06-091-83/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for reading and writing for Mono, MonoLSB and Indexed images in the tiff format. Previously, the images were always written in RGB32, dismissing the input format. Task-number: 254317 Reviewed-by: Samuel
| | | * Implemented the NET_WM_SYNC protocol on X11.Denis Dzyubenko2009-06-094-2/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done with Thorbjørn Lindeijer Task-number: 220550 Reviewed-by: Thorbjørn Lindeijer Reviewed-by: mae
| | | * Improves the documentation of QHeaderView::setResizeMode to specifyThierry Bastian2009-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | that the section indicated by the parameter logicalIndex should exist Task-number: 255541
| | | * removed foreach usage from animation APIThierry Bastian2009-06-091-14/+19
| | | |
| | | * small changes in private headersThierry Bastian2009-06-095-11/+4
| | | |
| | | * qdoc: The gray version.Martin Smith2009-06-091-1/+1
| | | |
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-0936-412/+510
| | | |\
| | | | * small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| | | | |
| | | | * small change to reduce static data sizeThierry Bastian2009-06-092-2/+2
| | | | |
| | | | * Prevented pixmap FBOs from growing too big.Samuel Rødal2009-06-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're painting to very wide and then very tall pixmaps we don't want the FBO to grow to max_width * max_height, instead we should recreate the FBO if it grows too large compared to what's being painted. Reviewed-by: Trond
| | | | * Optimized stencil buffer clearing in GL 2 paint engine.Samuel Rødal2009-06-092-42/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Zack's patch, 17e1bca1ce366395f8331e16aa96b7176ca1abac. Instead of manually clearing the stencil buffer after drawing we simply do the clearing and drawing in one go. Reviewed-by: Trond
| | | | * Resolved FBO extensions as well when resolving GL 2 extensions.Samuel Rødal2009-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The new GL 2 text drawing requries the FBO function pointers to be resolved.
| | | | * Improved clipping in GL2 paint engine.Samuel Rødal2009-06-097-186/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the stencil method to draw clip paths and regions to the Z-buffer instead of using glClear / glScissor. Using different depth values for the various clip parts also makes restore() very cheap when only IntersectClip is used. As an additional bonus this patch gives antialiased clip in the GL 2 paint engine. Task-number: 254658 Reviewed-by: Trond
| | | | * Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0)) for jpeg formats. Reviewed-by: thierry Task-number: 255627
| | | | * Fix focus frame on combobox on non-Windows stylesOlivier Goffart2009-06-093-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State_KeyboardFocusChange only makes sens on Windows. Follow the logic on the combobox as in PE_FrameFocusRect in the QWindowsStyle Task-number: 255482 Reviewed-by: jbache
| | | | * small refactoring to reduce memory usage of static dataThierry Bastian2009-06-094-11/+10
| | | | |
| | | * | Doc: Fixed QWebPage::forwardUnsupportedContent documentation and addedDavid Boddie2009-06-093-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more information about Web plugins. Reviewed-by: Trust Me
| | * | | Revert "implement equality operator in a more sane way"Andreas Aardal Hanssen2009-06-101-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07dca7a30d4bd1efd8032915700420cca3fd60fa. Move the equality operator code back in (qFuzzyCompare) to avoid breaking many autotests. The change should go back in later on, possibly supplemented by a qFuzzyCompare(QTransform) function. But until we can figure out how to not break everything this patch has to wait. Reviewed-by: Lars
| | * | | Fix sorting bug when using BSP tree index + add autotest.Andreas Aardal Hanssen2009-06-092-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use stable sorting to keep insertion order. This works fine as long as we sort a complete list of siblings in one go, and this list already has items in insertion order. But if we shuffle such a list, the only way to get proper sort order again (with insertion order intact), is if each item has a sibling index. We used to have this, but we don't have it anymore (as it's not needed for NoIndex mode). So until we separate the BSP index into a separate class and add this index there, we add this workaround which uses the toplevelitems list to ensure the items have the correct order. Reviewed-by: bnilsen
| | * | | Remove duplicated code for removing an item from the scene.Bjørn Erik Nilsen2009-06-095-140/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we had almost two identical functions for removing an item from the scene. There was only minor differences depending on whether the item was removed from QGraphicsScene::removeItem or from the item's destructor. Now we have one function that handles both cases just fine. Reviewed-by: Andreas
| | * | | Remove one unnecessary argument from the recursive draw function.Andreas Aardal Hanssen2009-06-093-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | We don't have to pass optimization flags; we already have a member variable we can test for painter state protection.
| | * | | Fix moving regression for ItemIgnoresTransformations items.Andreas Aardal Hanssen2009-06-091-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes a piece of code in 775ec8e96c9219981ff220ca5f3d24f0501d17b5 that was submitted by accident. The code in mouseMoveEvent is now identical to that in master.
| | * | | Fix QGraphicsView::render() regression, ensure the right device is passed.Andreas Aardal Hanssen2009-06-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we pass the viewport widget as the widget pointer when rendering to an arbitrary painter (e.g., onto a pixmap), we confuse the rendering functions to thinking that it's the viewport's region we should render into. So instead, when drawItems() is passed a painter that's different from the view, we pass 0 for the widget.
| | * | | Revert 7aee2a7054d1ca280f6dfc9c46b3fe2ce403ccb3, fix render bugs.Andreas Aardal Hanssen2009-06-092-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduced an unexpected interdependency for scenes with items that enable ItemStacksBehindParent, and that contain children that are transformed. There's a manual test for this, called clippingAndTransformations, which shows this problem. The bug has been fixed and this change also includes an autotest that covers exactly this problem.
| | * | | Add ItemSendsGeometryChanges, replacing itemChangeEnabled().Andreas Aardal Hanssen2009-06-095-72/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag toggles whether we should send notifications for setPos, setMatrix, and setTransform. It's off by default. Docs have been updated. All autotests pass. This change also cleans up a bit so that we both have readable code, and keeping the optimized path for when we need to send the notifications. By enabling this flag by default we are going to trigger regressions in end-user code. Reviewed-by: bnilsen