summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix infinite recursion in OpenVG scissor-only clippingRhys Weatherley2009-11-271-12/+0
| | | | | | | | | | | When a complex transform was set, clip(QVectorPath) would call clip(QRect) with the control point rect, which would then turn around and say "transform is complex, call clip(QVectorPath)", causing an infinite loop until stack crash. Remove the "fall back to vector path" case as it isn't useful for scissor-only clipping. Doesn't affect mask-based clipping. Reviewed-by: Sarah Smith
* QSortProxyModel: Crash when changing model with 2-level proxy and selected itemsGabriel de Dietrich2009-11-261-1/+5
| | | | | | | | The index mapping to the base model was being cleared before the persistant model indices. Reviewed-by: Olivier Task-number: QTBUG-6237
* Don't crash via proxy model when moving QModelIndexesStephen Kelly2009-11-261-1/+1
| | | | | | | | | | | The layoutAboutToBeChanged signal gives proxies a chance to persist QModelIndexes. The d->itemsAboutToBeMoved method is part of the process of moving the persistent indexes. d->itemsAboutToBeMoved must be called after layoutAboutToBeChanged. Otherwise persistent indexes will not be updated. Merge-request: 2219 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-267-67/+68
|\ | | | | | | 4.6-staging2
| * Fixed context menu placement partially outside screen bug in Symbian.Janne Anttila2009-11-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In style demo example when spinbox was long tapped, the context menu was placed partially outside screen. The preconditions for bug were: 1. Tap position is near screen right edge 2. Minimum space width requested by context menu is > sreen width The new (simplified) logic is as follows: 1. If menus right edge in requested position is outside screen right edge, the menu is moved to left enough to fit on screen. i.e. if (tap position + menu width > screen right ) x = screen right - menu width 2. As a result of above statement the x position might go outside left boundary of screen. This is fixed by next statements if( x < screen left ) x = screen left Task-number: QTBUG-6164 Reviewed-by: Alessandro Portale
| * Tidyup QS60Style - remove unused constants, replace magic valuesSami Merilä2009-11-262-12/+3
| | | | | | | | | | | | | | | | | | | | | | Basically this has three minor fixes: - remove unused style parts that were left over after unifying textEdit and lineEdit graphics - make radiobutton indicator one pixel smaller so it is perfect circle - replace magic "10" with calculated value Reviewed-by: Alessandro Portale
| * Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale
| * Remove some white-space from QS60StyleSami Merilä2009-11-261-5/+5
| | | | | | | | | | | | Remove some white space from QS60Style classes. Reviewed-by: TrustMe
| * Fixing background painting after orientation switch.Alessandro Portale2009-11-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478
| * Micro optimizationAlessandro Portale2009-11-251-1/+1
| | | | | | | | | | | | Don't request a palette if you do not use it. Reviewed-By: Trustme
| * Fixed context menu not to have "Options" action.Janne Anttila2009-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | When calling QMainWindow::setMenuBar(), menuBarAction ("Options") gets added to widget actions list. This actions will be shown in widget context menu if visible. That's why we set the action invisible. Visibility property does not have impact to softkey contruction, i.e. also invisble softkeys are added. Task-number: QTBUG-6220 Reviewed-by: Jason Barron
| * Fixes for tab/space usage in qwidget.cpp.Janne Anttila2009-11-251-15/+15
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-11-253-28/+35
| |\
| | * Removed unused setThemePalette(QStyleOption *option)Alessandro Portale2009-11-252-7/+0
| | | | | | | | | | | | | | | | | | Not used or missed, anywhere. Reviewed-By: Trustme
| | * Fix crash in QApplication::beep() on S60Shane Kearns2009-11-251-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using an asynchronous API synchronously caused a crash, because the data structure was deleted while an async request is still pending. Depending on the multimedia implementation on the phone, the crash will happen or you just get no sound (or it can even work if the underlying implementation is blocking). Solution is to use the API asynchronously, and delete the handling object in qt_cleanup. Also raised the tone by one octave to be more similar to the system beep. Task-number: QTBUG-6170 Reviewed-by: Janne Anttila Reviewed-by: Miikka Heikkinen
| * | Fixed crash when scrolling with deleted backingstoreJanne Koskinen2009-11-251-0/+2
| |/ | | | | | | | | | | | | | | | | | | In Symbian we save memory by deleting widget backingstore from non-visible windows. 12-key FEP is fullscreen and causes the backing store to be deleted but still continues to scroll the view to show current caret position in focused lineedit control. Task-number: QTBUG-5922 Reviewed-by: Jason Barron
* | Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of itemsAlexis Menard2009-11-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | was corrupted. This nasty bug was triggered when the index sort the top level list of items. We forgot to set the flag topLevelSequentialOrdering to false so when an item was removed from the top level list it was using the sibling index which can be not valid anymore since the list is not sorted by sequential order. So it let some dangling pointers in the list which make processDirtyItemRecursive crash the next paint event. Reviewed-by:bnilsen Reviewed-by:andreas
* | Moved functions from .h to .cpp in the GL2 engine stroker.Kim Motoyoshi Kalland2009-11-262-219/+208
| | | | | | | | | | | | | | Some of the functions had become too long to be inlined in my opinion. Reviewed-by: Trond
* | Fixed miter joins generated by the GL2 engine stroker.Kim Motoyoshi Kalland2009-11-261-17/+36
| | | | | | | | | | | | | | | | | | | | The stroker generated two points for each miter join, one on the convex side of the join, and one on the concave side. For sharp joins between curved segments, the point on the concave side could end up poking out of the stroke. This was fixed by generating one point on the convex side only. Reviewed-by: Trond
* | Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-264-46/+68
|\ \
| * | QGraphicsTextItem::setDefaultTextColor check change before calling update()Olivier Goffart2009-11-261-1/+3
| | | | | | | | | | | | | | | | | | | | | Some applications call setDefaultTextColor in the paint event. Task-number: QTBUG-6242 Reviewed-by: Gabriel
| * | Optimize QObjectPrivate::isSignalConnectedOlivier Goffart2009-11-262-42/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be seen in the GraphicsView benchmark. This function has to be as fast as possible. Make the function inline. We do not need 64bit for the connectedSignals bit array because it is very unlikely that an object will have more than 32 signals. (In Qt 4.5 it could have hapenned as the slot were counting in the index) Reviewed-by: bnilsen Reviewed-by: Brad
| * | QT_VG_EGL_CONFIG env var to specify explicit EGL configs for OpenVGRhys Weatherley2009-11-261-0/+36
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | Don't ask for pbuffers when searching for an OpenVG configurationRhys Weatherley2009-11-261-3/+3
| | | | | | | | | | | | Reviewed-by: Sarah Smith
* | | Fix uninitialized error variable if the stream doesn't existGordon Schumacher2009-11-261-1/+1
|/ / | | | | | | | | Merge-request: 2174 Reviewed-by: Eskil
* | Remove unused variables in QGraphicsItem and QGraphicsScene.Bjørn Erik Nilsen2009-11-254-34/+20
| | | | | | | | | | maybeDirtyClipPath and ingoreClipping is not relevant anymore now that the cached clip path is removed.
* | Remove caching of QGraphicsItem::clipPath().Bjørn Erik Nilsen2009-11-253-191/+8
| | | | | | | | | | | | | | | | | | The cache was added in 4.5 and was useful at that time. With 4.6 it is not relevant anymore since the only use case for it is item-lookup releated to mouse events and collision detection, so the overhead of maintaining the cache is more pain than gain. All existing auto tests pass.
* | Fixing background painting after orientation switch.Alessandro Portale2009-11-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478 Reviewed-by: Shane Kearns
* | Fixed round joins generated by the GL2 engine stroker.Kim Motoyoshi Kalland2009-11-251-49/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | Complete circles were generated at every round join, so if the join were close to a flat cap, the circle would extend beyond the flat cap. This was fixed by generating arcs rather than complete circles. Likewise, round caps are now semi-circles instead of full circles. I also removed some unnecessary calculations when generating square caps. Reviewed-by: Trond
* | Make the spinbox and doublespinbox better accept intermediate inputThierry Bastian2009-11-251-65/+35
| | | | | | | | | | Task-number: QTBUG-5008 Reviewed-by: ogoffart
* | Offset in MDI subwindow bar buttons under Mac OS 10.6Gabriel de Dietrich2009-11-251-3/+5
| | | | | | | | | | Task-number: QTBUG-5830 Reviewed-by: Richard
* | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-2517-69/+165
|\ \
| * \ Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-11-2518-91/+150
| |\ \
| * \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-2538-88/+283
| |\ \ \
| | * \ \ Merge commit '0d20ec8604b318ceafd6c35dfe1d73519bf024d3' of oslo-staging-1 ↵Simon Hausmann2009-11-2514-32/+109
| | |\ \ \ | | | | | | | | | | | | | | | | | | into 4.6
| | | * | | QNetworkCookieJar: don't do path checking when receiving cookiesPeter Hartmann2009-11-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually, the RFC 2109 says cookies should not be stored if the path attribute is not a prefix of the request URI the cookie comes from. However, all browsers allow it anyway; with the demo browser e.g. logging in to wordpress.com was not possible. We still do path checking when sending cookies, i.e. in QNetworkCookieJar::cookiesForUrl(). Reviewed-by: Markus Goetz Task-number: QTBUG-5815
| | | * | | Fix accept call in q3processMarkus Goetz2009-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QT_SOCKLEN_T like we do on all other places where accept() is called. Task-number: QTBUG-6141 Reviewed-by: mstormo
| | | * | | Fix QWindowsSystemProxy::initMarkus Goetz2009-11-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like WinHttpGetIEProxyConfigForCurrentUser can return more than one proxy even if this is not documented. Task-number: QTBUG-5981 Reviewed-by: Peter Hartmann
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2414-17/+87
| | | |\ \ \
| | | * | | | Fixes: Fuzzy standard icons with Ubuntu Humanity themeJens Bache-Wiig2009-11-231-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6121 RevBy: thorbjorn Details: This icon theme is a bit special in that it uses svg icons even for fixed size entries such as 16x16 icons. An optimization in the icon loader explicitly ignores svgs for such entries so we simply have to remove this check. In addition the actualSize had to be altered to never return a size bigger than the requested size. Otherwise certain menu elements will be bigger than intended.
| | | * | | | Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The built-in eval() function bypasses the script registration performed by QScriptEngine::evaluate(), so if we get an atStatement() callback from JSC from that script, the scriptID-to-sourceProvider lookup will fail. In this case, just return from atStatement() without delivering the positionChange() callback to the QScriptEngineAgent, since the agent will not have received the scriptLoad() callback for that script anyway. This is a change in behavior from 4.5, but we consider it the minimum-impact fix at this point to keep 4.6.0 from crashing. The only downside is that debugging will effectively be "disabled" for the script passed to eval(), but that's a lot better than crashing. Task-number: QTBUG-6108 Reviewed-by: Jedrzej Nowacki
| | | * | | | Mac: Make gestures available when building Qt against SDK < 10.6Richard Moe Gustavsen2009-11-232-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We build the release packages for Carbon against the 10.4 SDK. This means that the constants used for dealing with gestures are missing, and currently the implementation will be ifdeffed out. This patch defines these constants when building with an SDK < 10.6. Gestures will therefore work when running applications on 10.6. The same fix is also implemented for cocoa. Rev-By: MortenS
| | | * | | | Cocoa: native dialogs might hang the application on closeRichard Moe Gustavsen2009-11-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements the same fix as 639b9c0286f0f2d5e50121df8d4125f029074510, but when someone spins the event dispatcher manually (calling processEvents themselves). Rev-By: MortenS
| | | * | | | Mac: remove superflucious callRichard Moe Gustavsen2009-11-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line removed in the patch is done so as a result of change 639b9c0286f0f2d5e50121df8d4125f029074510. That change made the interrupt do an extra round in the event dispatcher.
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-235-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( efa69b6181ce5c045097351cdcf6c158da3f4888 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Olivier Goffart <ogoffart@trolltech.com> Reviewed by Simon Hausmann. [Qt] Normalize signal and slot signatures. * Api/qgraphicswebview.cpp: (QGraphicsWebView::setPage): * Api/qwebview.cpp: (QWebView::setPage): * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::setFrame): * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp: (wrapInFunction): * tests/qwebframe/tst_qwebframe.cpp: * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::modified): (tst_QWebPage::database):
| | | * | | | Mac: added some useful comments onlyRichard Moe Gustavsen2009-11-231-0/+3
| | | | | | |
| | * | | | | Fixes implicit grabbing in Qt/CocoaDenis Dzyubenko2009-11-252-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and deliver the event to it and do not try to propagate the event to the parent view. Reviewed-by: Prasanth (cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30)
| | * | | | | Fix QFile::map in Linux 64bitOlivier Goffart2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 64bit, qint64(size_t(-1)) = -1 Reviewed-by: Joao Reviewed-by: Thiago (cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec)
| | * | | | | Fix softkeys for QDialogButtonBoxes created without a parent.Jason Barron2009-11-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inthe case where a QDialogButtonBox was created without a parent, for example in the FTP example, the softkeys that are automatically created inside the button box were not being added to the right widget when the button box was given a parent (or added to a layout) later. This patch resolves that issue by handling the ParentChange event and then adding the softkeys at this point. Task-number: QTBUG-6086 Reviewed-by: axis
generated by cgit v0.12 at 2025-03-12 16:20:55 (GMT)