summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-12124-1028/+1926
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * Set qreal to float for Symbian.Martin Jones2009-06-121-1/+1
| | | | | | | | Make sure we match the logic in qglobal.h.
| * Fixed qtextcodec autotest so it can be run from a build directory.Denis Dzyubenko2009-06-112-6/+6
| | | | | | | | Reviewed-by: trustme
| * UTF-8 text codec should be able to convert data when fed one by one byte.Denis Dzyubenko2009-06-113-1/+77
| | | | | | | | | | | | | | When the input data is fed to utf-8 by one byte it couldn't parse the BOM correctly. So we wait until the BOM is composed into a code point and check it afterwards. Reviewed-by: Olivier Goffart
| * Skip the byte order mark when converting the utf16 and utf32 dataDenis Dzyubenko2009-06-112-3/+15
| | | | | | | | | | | | | | | | | | When reading one character at a time (as QTextStream::pos does) the byte order mark could be ignored. This happens only with UTF-16 BE/LE and UTF-32 BE/LE codecs. This fixes the qtextstream autotest. Author: Olivier Goffart Author: João Abecasis
| * Use the old codec if there is one available when reading data in qtextstream.Denis Dzyubenko2009-06-111-1/+1
| | | | | | | | Reviewed-by: trustme
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-111-1/+1
| |\
| | * Compile the qsettins autotestOlivier Goffart2009-06-111-1/+1
| | | | | | | | | | | | As suggested in merge request 641
| * | Doc: Make it easier to find supported platform information from theDavid Boddie2009-06-111-0/+3
| |/ | | | | | | | | | | installation page. Reviewed-by: Trust Me
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-114-32/+103
| |\
| | * Painting artifacts in QGraphicsView.Bjørn Erik Nilsen2009-06-114-10/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem appears in the chip demo when clicking an item while scrolling the view using the mouse wheel. The problem was that we didn't translate the the item's old painted view rect. There was also a problem when enabling the DontAdjustForAntialiasing flag, causing an item to not redraw its edges. We have to adjust the rectangle by (-1, -1, 1, 1) since QRect() and QRectF() behaves differently. Auto-test (made by Andreas) included. Reviewed-by: Andreas
| | * QGraphicsView: Replace update() with updateAll().Bjørn Erik Nilsen2009-06-112-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some nice cut-offs when there's a full update pending, but we don't know about it if we call update() directly on the viewport. Instead call QGraphicsViewPrivate::updateAll() which has the same effect, except that it also sets a flag telling us a full update is pending. Reviewed-by: Andreas
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-1170-466/+444
| |\ \ | | |/
| | * Use the original order if two files are equivalent for the sort of QDirBenjamin Poulain2009-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | | Set back the sort order of QDir::entryList() and entryInfoList(). This complement the change of aa2adb8d0072eccb549692d56168b8fde33f7b4f Reviewed-by: Olivier
| | * Sort QDir with qSort instead of qStableSortBenjamin Poulain2009-06-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The commit 3e7fc907e5cc1937fb98bf4581cee960fe3d4e7a have changed the behavior of sorting of QDir. This revert to the old behavior with qSort instead of qStableSort. Reviewed-by: Alexis
| | * Fixed ToolBar layout so that when a toolbar is resized to its sizeHintThierry Bastian2009-06-111-3/+4
| | | | | | | | | | | | we get a "sticky" effect
| | * small change in a string, using startsWithThierry Bastian2009-06-111-1/+1
| | |
| | * Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-1147-180/+178
| | |
| | * refactor of private getters for the mode i item widget classesThierry Bastian2009-06-118-162/+158
| | |
| | * remove q->layout() and q->parentWidget() code where unnecessaryThierry Bastian2009-06-1116-93/+84
| | |
| | * Fixed clipping bugs due to not accounting for the redirection offset.Samuel Rødal2009-06-111-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | Also, updateInvMatrix() can be greatly simplified as updateMatrix() is always called whenever anything related to the state matrix changes, so we can assume that it's up-to-date. Reviewed-by: bnilsen
| | * doc: Fixed several qdoc warnings.Martin Smith2009-06-112-4/+7
| | |
| * | Doc: Added information about QDBUS_DEBUG to the D-Bus documentation.David Boddie2009-06-112-1/+23
| |/ | | | | | | | | Task-number: 253715 Reviewed-by: Trust Me
| * Makes the ODF writer use one text:tab tag for each tab, per ODF spec.Thomas Zander2009-06-112-29/+24
| | | | | | | | | | | | | | | | We used tab-ref to place multiple tabs compressed into one tag just like text:s does, but thats not what the spec says. We now don't sum up tabs anymore but just simply write out one "<text:tab/>" tag per tab. Task: 249110
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-115-16/+11
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMorten Sørvig2009-06-114-33/+26
| |\
| | * QHttpNetworkConnection: Removed an unnecessary/dead checkMarkus Goetz2009-06-113-16/+12
| | |
| | * QHttpNetworkConnection: Some renamingsMarkus Goetz2009-06-112-17/+14
| | | | | | | | | | | | Reviewed-by: Prasanth
| * | Make configure pass the -sdk option on to the configure tests.Morten Sørvig2009-06-112-27/+38
| |/ | | | | | | | | | | | | | | This makes sure that we only detect and use libraries that are actually in the SDK. Task-number: 109757 Reviewed-by: Richard Moe Gustavsen
| * Make sure custom arrow images works if we only specify it.Olivier Goffart2009-06-114-4/+158
| | | | | | | | | | | | | | | | Include change for spinbox, combobox, and menu. Task-number: 255849 Tested-by: Pierre Reviewed-by: jbache
| * Only include QMetaType if required in moc generated filesOlivier Goffart2009-06-112-3/+8
| | | | | | | | | | | | | | | | | | | | | | Including it might cause build errors. (and thus break source compatibility) The problem was seen on KDE where some cpp files included x11 headers and then later included the .moc file, then qmetatype.h complains that Bool is defined Reviewed-by: Brad
| * Clean up qwidget_p.h since the last changeOlivier Goffart2009-06-111-8/+6
| | | | | | | | | | Reviewed-by: bnilsen Reviewed-by: Denis
| * 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.
generated by cgit v0.12 at 2024-11-14 20:58:57 (GMT)