summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Invalid QPersistentIndexes after QStandardItem::takeRowOlivier Goffart2009-06-113-36/+148
| | | | | | | | | | | | | | | We need the parent of each potential QPersistentModelIndex in order to cleanup when removing the rows. They need not to change in order QSortFilterProxyModel maping to be still valid. takeRow must not change the internal data before calling beginRemoveRow. Same thing for takeColumn Task-number: 255652 Reviewed-by: Thierry Reviewed-by: Leo
* Autotest compile.Olivier Goffart2009-06-111-1/+1
| | | | This one is for qstandarditemmodel autotest
* add parent and id properties to QGraphicsObjectLars Knoll2009-06-112-3/+76
| | | | | | In addition added documentation for the other properties. Reviewed-by: Andreas
* added properties for x,y and z. Removed the notify for the pos property,Lars Knoll2009-06-116-13/+315
| | | | | | | | | | | | add auto tests for QGraphicsObject FX items are better off with property notifications on each component rather than on the position. Added some basic testing for QGraphicsObject and fixed the failures exposed. Reviewed-by: Andreas
* Add some meat to QGraphicsObjectLars Knoll2009-06-114-107/+166
| | | | | | | | Added a toGraphicsObject() method to QGraphicsItem to allow upcasting. Expose some of QGraphicsItems setter/getter pairs as real properties in QGraphicsObject, including NOTIFY signals. Reviewed-by: Andreas
* move some properties from QGraphicsWidget to QGraphicsObjectLars Knoll2009-06-112-4/+4
| | | | | | These are properties of QGraphicsItem. QGraphicsObject should expose these. Reviewed-by: Andreas
* add a QGraphicsObject class and change QGraphicsWidget and QGraphicsTextItem ↵Lars Knoll2009-06-115-49/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | to inherit from it This changes the inheritance hierarchy of QGraphicsWidget from multiply inheriting from QObject, QGraphicsItem and QGraphicsLayoutItem to inherit from QGraphicsObject and QGraphicsLayoutItem. QGraphicsObject then simply inherits from QObject and QGraphicsItem. This change is binary compatible as it will leave the vtable layout unchanged and as the parent class doesn't appear in the C++ name mangling on any of our platforms. It's also source compatible as it isn't noticable by existing code. The restriction we have on QGraphicsObject is that we can not add any new virtual methods to it, or add data members to the class. We can however implement a QGraphicsObjectprivate inheriting from QGraphicsItemPrivate if there is a need to add data members to the class. This change will allow us to now have one single base for all QGraphicsItems that inherit from QObject: QGraphicsTextItem, QGraphicsWidget and in the future QFxItem. Having that single base class will significantly simplify our work in the qml engine. Reviewed-by: Andreas
* Partially revert "Add (back) properties to QGraphicsItem to change theBjørn Erik Nilsen2009-06-111-1/+3
| | | | | | | | | | | | | | | transformations component" This partially reverts commit 56f23d4c, which changed the logic in updateCachedClipPathFromSetPosHelper. We cannot compute the item's transform relative to the parent by using transformToParent() because the new position is not yet set on the item, that's why the new position is passed into the function. However, I'll look into how we can get rid of the entire function, but keep it as is for now. Reviewed-by: Olivier
* Compile on the Mac.Bjørn Erik Nilsen2009-06-111-2/+2
| | | | Broke after this commit: 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6
* Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-112-4/+1
| | | | Reviewed By: andy
* Reduce left-margins in qdocJens Bache-Wiig2009-06-101-6/+3
| | | | | | The current implementation is a bit hackish and does not work for all cases. It is better to remove it for now until we have a proper way of supporting it.
* We don't have to combine the world matrix anymore.Bjørn Erik Nilsen2009-06-101-5/+3
| | | | | | See also: 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6 Reviewed-by: Andreas
* Improve QDirPrivate::sortFileList by leaving right avway isRitt Konstantin2009-06-101-19/+23
| | | | | | | | | | we don't need to sort. Reviewed-by:alexis Request-url: http://qt.gitorious.org/qt/qt/merge_requests/636 Merge-request: 636 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* Optimize QDirPrivate::sortFileList by using a QFileInfoListRitt Konstantin2009-06-101-13/+28
| | | | | | | | | | | directly instead of "constructing" a new one with empty file infos Reviewed-by:alexis Request-url: http://qt.gitorious.org/qt/qt/merge_requests/636 Task-number:253382 Merge-request: 636 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* tst_qpixmap compile fixJoerg Bornemann2009-06-101-1/+1
| | | | | | QPixmap(QImage) works with Qt3 support only... Reviewed-by: thartman
* Some adjustments to the documentationJens Bache-Wiig2009-06-102-42/+49
| | | | | Headers are slightly lighter now. Not all tables are affected by the changes any more.
* Adding support in QVariant for conversions between QUrl and QStringThierry Bastian2009-06-102-5/+25
| | | | Reviewed-by: ogoffart
* removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-1013-138/+123
| | | | private class member.
* Fixed memory leak in raster paint engine.Samuel Rødal2009-06-101-1/+3
| | | | | | | Unlike the span array, the clip line array is only free'd in the destructor, so if it's already allocated we shouldn't allocate it again. Reviewed-by: Denis Dzyubenko
* Make QVectorPath::controlPointRect() return a QRectF.Samuel Rødal2009-06-104-16/+13
| | | | | | This makes debugging etc much easier, plus most of the places controlPointRect() was called the caller had to convert the rect to a QRectF manually.
* 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