summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update flickable visual test.Martin Jones2009-06-217-225/+5
| | | | | Not yet working. There are event timing problems with the test engine.
* Remove unneeded semicolons.Martin Jones2009-06-123-4/+4
|
* 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
* qdoc: Mention that QML_DECLARE_TYPE only works for non-abstract classesKai Koehne2009-06-111-1/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-11136-2150/+3780
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * typo in my recent changeWarwick Allison2009-06-101-1/+1
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-06-10134-2149/+3679
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Bjørn Erik Nilsen2009-06-101-2/+2
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * qdoc: Fixed XML-level breakage.David Boddie2009-06-101-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-10123-2130/+3580
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 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-104-31/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1018-169/+316
| | | |\
| | | | * 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-102-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | 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-104-64/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1080-525/+1130
| | | |\ \ | | | | |/
| | | | * 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
| | | | * qdoc: Added new class names for different tables.Martin Smith2009-06-101-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class="valuelist" is for the table used for enum types. class="alignedsummary" is for summary sections aligned on the name. class="propsummary" is for the property summary section. class="toc" is used for tables of contents. class="generic" is used for all other tables. We might need to break this down more.
| | | | * 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-1017-19/+49
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-83/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-9/+44
| | | | |
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-0952-457/+627
| | | | |\
| | | | | * small improvement/refactor to cssparserThierry Bastian2009-06-093-44/+44
| | | | | |
| | | | | * small change to reduce static data sizeThierry Bastian2009-06-092-2/+2
| | | | | |
| | | | | * Removed background caching in embeddeddialogs demo.Samuel Rødal2009-06-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No point in caching a background that is already a pixmap. When maximizing the window this pixmap gets huge, and it doesn't help performance either. Reviewed-by: Trond
| | | | | * 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
| | | | | * WinCE doesn't have time() function, use QTimeKent Hansen2009-06-091-3/+2
| | | | | |
| | | | | * Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-092-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0)) for jpeg formats. Reviewed-by: thierry Task-number: 255627
| | | | | * Fix QImageReader autotest compilationLeonardo Sobral Cunha2009-06-091-1/+1
| | | | | |
| | | | | * 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
| | | | | * make bic test works in shadow buildOlivier Goffart2009-06-092-16/+23
| | | | | |