summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation with strict iteratorsDavid Faure2009-05-181-1/+1
|
* Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-159-168/+123
| | | | | | | | | | | | | | | | | | | | | QStyleOptionGraphicsItem extends QStyleOption with three values: 1) matrix, 2) levelOfDetail, 3) exposedRect, and they all involve expensive QTranform operations when calculated. We pass style option(s) to drawItems() and paint(), but the extended values are usually not in use. We can therefore gain quite some nice speedup by making them opt-in with the QGraphicsItem::ItemUsesExtendedStyleOption flag. Additionally, QStyleOptionGraphicsItem::levelOfDetail has been obsoleted, and a new function QStyleOptionGraphicsItem:: levelOfDetailFromTransform(const QTransform &) has been added. Me and Andreas don't consider this change to be too controversial even though it changes the behavior. Auto tests still pass. Reviewed-by: Andreas
* Merge branch '4.5'Thiago Macieira2009-05-1415-75/+70
|\ | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-2/+2
| | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
| * Fixed an issue with text drawing under Windows.Trond Kjernaasen2009-05-142-10/+7
| | | | | | | | | | | | | | | | | | | | Some text drawn with OpenType fonts where cut off by a pixel or two under certain circumstances. This adds an additional 2 pixel pad margin to the glyph cache entries. The padding behaves slightly different when ClearType is enabled/disabled, hence the general 2 pixel padding. Task-number: 246196 Reviewed-by: Samuel
| * Compile.Norwegian Rock Cat2009-05-141-1/+1
| | | | | | | | | | | | Need the proper types. Reviewed-by: Andy
| * Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-142-3/+3
| | | | | | | | | | | | foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
| * Fixed regression that prevented any widget from having focus when graphics ↵jasplin2009-05-141-4/+2
| | | | | | | | | | | | | | | | | | | | | | view was disabled. A bug in Commit d5c018f7b014ab794e49d6e1f24e02233555847d prevented any widget from having focus when QT_NO_GRAPHICSVIEW was defined. This patch fixes the bug. Reviewed-by: bnilsen Task-number: 249589
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy2009-05-143-28/+10
| |\
| | * Fix QGraphicsItem::deviceTransform() to also work with normal items.Andreas Aardal Hanssen2009-05-143-28/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::deviceTransform() returns the item-to-device transform, provided with the device-to-scene transform, and combining it with the item's scene transform. This function is meant to handle items that enable ItemIgnoresTransformations, but it happened to not work properly for items that _don't_ enable that flag. Unfortunately this bug is hard to work around for users from the outside, as it requires you to check if the item or any ancestor enables ItemIgnoresTransformations. The fix also removes unnecessary branchs inside QGV so that we use the same function for all items. Reviewed-by: bnilsen
| * | Prevent duplicate entries in the sidebar when the paths are the sameAndy2009-05-141-2/+2
| |/ | | | | | | | | | | | | | | | | If two urls were added to the sidebar that only differed in how they referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one entry should appear. Task-number: 253532 Reviewed-by: Alexis
| * Sheets misbehaviour on Carbon - Mac OS XRichard Moe Gustavsen2009-05-141-10/+0
| | | | | | | | | | | | | | | | | | | | Seems like some old legacy code was left behind when sheets behaved as application modal. This is not the case anymore, so this patch just removes the special case code for enforcing the old behaviour, and let carbon do the correct thing instead. Task-number: 252379 Reviewed-by: Trenton Schulz
| * Use newer safer error function if available.Bill King2009-05-141-2/+9
| | | | | | | | | | | | Uses fb_interpret instead of isc_interprete if using firebird. Closes a potential security hole/buffer overrun. Reviewed-by: Justin McPherson
| * Fix broken wince build.Jason McDonald2009-05-131-1/+1
| | | | | | | | | | | | | | The WinCE build was failing due to a spelling error in an #ifdef directive. Reviewed-by: Trust Me
| * HTTP backend / network cache: only cache responses to GET by defaultPeter Hartmann2009-05-131-12/+30
| | | | | | | | | | | | | | | | responses to POST might be cacheable, but are not cacheable by default; responses to PUT or DELETE are never cacheable. Reviewed-by: Thiago Macieira Task-number: 252281
| * Cleaning docsMorten Engvoldsen2009-05-131-1/+3
| | | | | | | | | | | | | | | | Highlight part of the general description in QTimeLine Task-number: 218487 Rev-by: Geir Vattekar
| * Adding details to QVariant docsMorten Engvoldsen2009-05-131-2/+3
| | | | | | | | | | | | | | | | Adding note about requriements for converting QVariants Task-number: 192607 Rev-by: David Boddie
* | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-2/+2
| | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
* | Fix QSplitter::setHandleWidth to work with motif styleJens Bache-Wiig2009-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | Motif style was incorrectly adjusting it's size in sizeFromConents. This is wrong and prevents the function from overriding the huge minimum size on the widget. PM_SplitterWidth already ensures the proper default size for the splitter. Task-number: 194542 Reviewed-by: ogoffart
* | Find chart.exe on windows.Morten Sørvig2009-05-141-2/+6
| |
* | Fix missing update of edit geometry on QSpinBoxJens Bache-Wiig2009-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | When showing or hiding spinbox buttons we did not update the child line edit geometry. This would on windows basically mean that the buttons would not show up as they were completely covered by the edit. Task-number: 235747 Reviewed-by: ogoffart
* | Ensure style option for drawing blank area in scrollarea is initialized.Norwegian Rock Cat2009-05-141-3/+4
| | | | | | | | | | | | | | Then you can actually influence it's palette. Task-number: 253495 Reviewed-by: Jens Bache-Wiig
* | Remove snapback/maximum drag distance from QSliderJens Bache-Wiig2009-05-142-11/+1
| | | | | | | | | | | | | | | | | | | | | | This feature was only intended for QScrollBar and was incorrectly inherited by QSlider. The only supported platform that use this feature seems to be Windows so instead of doing a nasty qobject cast in the styling it makes more sense to remove the functionality from QSlider entirely. Task-number: 245681 Reviewed-by: ogoffart
* | Fixes combobox menu separator on XPJens Bache-Wiig2009-05-141-1/+6
| | | | | | | | | | | | | | | | | | | | While the delegate is somewhat abusing the ToolbarSeparator here, we should make sure we draw something for small heights as well. It seems microsoft requires us to allocate a few more pixels for the separator to actually be visible. Task-number: 249192 Reviewed-by: ogoffart
* | Fix sending of double-click events after explicit grab-ungrab.Andreas Aardal Hanssen2009-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug report came from the Declarative UI project as part of Kinetic. In FxFlickable the mouse is explicitly grabbed inside the mouse press event handler, and it's (explicitly) released in the release handler. When doing this, lastMouseGrabber is 0, and the double-click is delivered as a press. The fix is to not convert the double-click to a press if the receiver is the first and only mouse grabber (i.e., lastMouseGrabber is 0). The fix isn't entirely correct, as it can in theory allow an item to receive a double-click event as the first received event. This seems to only be possible in the case of using explicit mouse grabbing in combinations with the press and release event handlers so it's quite a corner case. Reviewed-by: Alexis
* | Remove useless code and comment in QTreeViewOlivier Goffart2009-05-141-4/+0
| | | | | | | | | | | | In 8cd19116ae81c99fe28fbf91aa7f4c1c08163fe0 we changed viewItems to always contains the index to the columns 0, even if this columns is hidden. So this code and comment are now useless.
* | Fix Toolbutton font with pseudo-statesOlivier Goffart2009-05-142-0/+2
| | | | | | | | | | | | | | | | | | So now QToolButton:pressed {text-decoration: underline} will works The change in QCommonStyle is to make it consistant with the setFont few lines later. Reveiwed-by: jbache
* | Fixes missing translations in QFileIconProviderJens Bache-Wiig2009-05-141-8/+4
| | | | | | | | | | | | | | | | While lupdate ignores ifdefs, it cannot handle ifdefs inside the translate statement itself. Task-number: 188337 Reviewed-by: janarve
* | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-1464-1618/+2196
|\ \
| * | Ensure that sheets are hidden if the parents are hidden in Carbon.Norwegian Rock Cat2009-05-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Seems to work correctly in Cocoa, but we need to handle this special case in Carbon ourselves. Task-number: 253324 Reviewed-by: Richard Moe Gustavsen
| * | Merge branch '4.5'Thiago Macieira2009-05-135-25/+60
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | * Improve the HTTP status line parsing and catch more errors.Thiago Macieira2009-05-132-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for using QByteArrayMatcher for one single character, so avoid the overhead. Also validate the message header a bit more: we require the status line to start with "HTTP/n.m " where n and m are positive integers less than 10. Task-number: 248838 Reviewed-by: Markus Goetz
| | * Fix handling of garbage data sent by the HTTP server instead of aThiago Macieira2009-05-132-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper HTTP reply. If the server's reply doesn't start with "HTTP/", then the reply is not valid. This could happen if we connected via HTTP to an HTTPS server. It could also happen with an Icecast server (reply ICY/x.y). Task-number: 248838 Reviewed-by: Markus Goetz
| | * qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-2/+3
| | |
| | * qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-3/+3
| | |
| | * Reset the 'connectedToScene' flag when changing the scene of a viewLeonardo Sobral Cunha2009-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QGraphicsScene::_q_emitUpdated() the slot QGrpahicsView::updateScene(QList<QRectF>) gets connected and a boolean (connectedToScene) is set to prevent double connections. The problem is that this boolean was not reset when the view gets a new scene. Task-number: 253415 Reviewed-by: andreas
| * | QNAM: Upload architecture change: Changed all QNAM backendsMarkus Goetz2009-05-138-371/+198
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: ContentReSendErrorMarkus Goetz2009-05-132-0/+5
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: Upload architecture change: Backend and QNetworkReplyImpl changesMarkus Goetz2009-05-135-134/+188
| | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QNAM: Upload architecture change: HTTP implementationMarkus Goetz2009-05-136-126/+144
| | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | QNAM: Added DoNotBufferUploadDataAttributeMarkus Goetz2009-05-132-0/+8
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | QNonContiguousByteDevice: An wrapper around QByteArray, QIODevice, ...Markus Goetz2009-05-133-0/+733
| | | | | | | | | | | | | | | | | | | | | | | | | | | New private class, needed for the rewrite of the upload side of QNetworkAccessManager. Allows to have a "byte pointer view" on stuff like QRingBuffer, QByteArray, QFile and any QIODevice. Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| * | QRingBuffer: Enanced with readPointerAtPositionMarkus Goetz2009-05-131-0/+46
| | | | | | | | | | | | Ability to read from a QRingBuffer at any position without modifying it.
| * | Fix warningOlivier Goffart2009-05-131-2/+1
| | | | | | | | | | | | Reviewed-by: Denis
| * | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-132-146/+0
| | | | | | | | | | | | | | | | | | | | | The private class was already declared and defined in the qfileinfo.cpp file. Reviewed-by: thiago
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-1316-214/+311
| |\ \ | | |/
| | * fix WinCE buildMaurice Kalinowski2009-05-131-0/+2
| | | | | | | | | | | | Reviewed-by: thartman
| | * Fixes a segfault from out of order cleanup of mysql resources.Bill King2009-05-131-50/+73
| | | | | | | | | | | | | | | | | | | | | If a QSqlQuery survived the lifetime of removal of a mysql db connection (that failed), the cleanup code would cause a segfault because it was using an out of date pointer that was pointing at memory that'd been freed by the removeDatabase() call. Revby: Justin McPherson Task-number: 205701
| | * Fixed wrong function name in warningAnders Bakken2009-05-121-3/+3
| | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * Document a gotcha with QIcon::addFileNorwegian Rock Cat2009-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | addFile makes a QIcon not null, which may be a surprise if the path given is bad. Reviewed-by: Jens Bache-Wiig