summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix docs for QGLFramebufferObject & add warnings in bind/releaseTom Cooksey2009-11-051-7/+16
| | | | | | | Warnings are for binding/releasing when the current context isn't in the same context group as the FBO was created in. Reviewed-By: Trond
* Remove unnessisary QGLFBOGLPaintDevice re-implementationsTom Cooksey2009-11-052-33/+0
| | | | | | | Now QGLFBO doesn't do stacking, QGLPaintDevice's base implementation is ok to use. Reviewed-By: Trond
* Fixed crash in QPixmap::resize_helper on mac and x11Gunnar Sletta2009-11-051-2/+2
| | | | Reviewed-by: Trond
* Add test for QEventTransition when filtering on a QApplication instanceEskil Abrahamsen Blomfeldt2009-11-051-0/+31
| | | | | | Test for 8ec037effce7f515fffed6b05c011e385fb52593. Reviewed-by: Gunnar
* Don't crash in QStateMachine when event transition listens toEskil Abrahamsen Blomfeldt2009-11-051-3/+2
| | | | | | | | | | QApplication instance We can't assert on actually watching the watched object, since we may have installed an event filter on QApplication::instance(), in which case we will filter events for all objects. Reviewed-by: Gunnar
* Removed the FBO stacking behaviour and the test attached to it.Trond Kjernåsen2009-11-053-133/+9
| | | | | | | Having this behaviour in QGLFrameBufferObject complicates alot of things and isn't really necessary. Reviewed-by: Tom Cooksey
* Fixed soft-light composition mode in raster and OpenGL1.Kim Motoyoshi Kalland2009-11-053-351/+371
| | | | | | | | | Updated the soft-light composition mode implementation in the raster and OpenGL1 engines to use the equations in the SVG specification as of April 2009. Task-number: QTBUG-3193 Reviewed-by: Trond
* Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-059-207/+257
| | | | Reviewed-by: Sarah Smith
* Fixed some debug and some minor optims to QPaintBuffergunnar2009-11-042-40/+60
| | | | Reviewed-by: TrustMe
* Made QPen== catch QPen(Qt::NoPen) == QPen(QBrush(Qt::NoBrush))gunnar2009-11-041-10/+13
| | | | | | | QSvgDocument uses the latter as default pen so every svg filling command would issue a penChange without this. Reviewed-by: TrustMe
* Added some helpful info to QBrush and QPen's QDebug operatorsgunnar2009-11-042-2/+34
| | | | Reviewed-by: TrustMe
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-04117-1220/+1883
|\
| * eval: add key for the installer to grep for.Daniel Molkentin2009-11-043-2/+2
| | | | | | | | Reviewed-By: con
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-04225-3869/+5024
| |\
| | * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0455-806/+1161
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | * Compile fix after the last gesture api changeDenis Dzyubenko2009-11-037-58/+50
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Cocoa: fix q3filedialog autotestRichard Moe Gustavsen2009-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3FileDialog does not exist in the cocoa port. Do ifdef this test out on cocoa Rev-by: prasanth
| | | * Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scale the pixmap to correct size (16,16) before setting as the image for the Document Icon button. Reviewed-by: Denis
| | | * Gesture api review.Denis Dzyubenko2009-11-0335-446/+441
| | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | * Modified gesture events propagation.Denis Dzyubenko2009-11-036-37/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| | | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-038-72/+90
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-039-102/+130
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Improved gesture scrollarea manualtest.Denis Dzyubenko2009-11-032-11/+33
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-033-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| | | * Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-033-5/+6
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * Cocoa: fix double emit bug from file dialogRichard Moe Gustavsen2009-11-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, Cocoa tells us twize whenever a selection change occurs in the native file dialog. This patch inserts a check that the selection actually changed before emitting any signals Rev-By: Prasanth
| | | * Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standardWindowButton:NSWindowDocumentIconButton will not return a valid NSButton unless you call setRepresentedURL or setRepresentedFilename for the NSWindow. This patch makes sure that setWindowIcon_sys() sets the icon using a valid NSButton. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-10-307-49/+182
| | | |\
| | | | * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-305-22/+109
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Denis
| | | | * Fix unit test and add autoCancel test for graphicsviewThomas Zander2009-10-301-26/+72
| | | | |
| | | | * Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | | * | Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-303-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataLocation now behaves as on the other platforms, QCoreApplication::organizationName() and applicationName() is included in the returned path.
| | | * | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| | | | |
| | | * | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-4988 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced a regression preventing the mac-spesific standardIcon code form being called. Call the Mac code if desktopSettingsAware is set. (QIcon::themeName() is only set on X11)
| | * | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Changelog 4.6.0: Designer/uic/uic3.Friedemann Kleint2009-11-041-0/+23
| | | |
| | * | Merge branch '4.6-s60' into 4.6axis2009-11-0441-186/+365
| | |\ \
| | | * | Made xmlpatterns autotests compile for SymbianMiikka Heikkinen2009-11-0315-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed xmlpatterns autotests so that they compile for Symbian with both RVCT and NokiaX86 compilers. Reviewed-by: Janne Koskinen
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-032-2/+4
| | | |\ \
| | | | * | Fixed an input method bug when erasing the last character.axis2009-11-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the editor contents if the new preedit string was empty. However, it could be empty because the user just erased it, so the bug was fixed by checking whether the preedit string in the event and in the editor are different. RevBy: Denis Dzyubenko
| | | * | | Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pro-file is missing '+' when it is adding QtOpenVg support for sis file. Task-number: None Reviewed-by: Janne Koskinen
| | | * | Fix qdatetime autotest regressionShane Kearns2009-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous addition to the test case to validate local time was too strict for all platforms. Reviewed-by: Paul
| | | * | Fix qclipboard autotest on s60 3.1Shane Kearns2009-11-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It launches 2 subprocesses that use QApplication. Added the resource files to deployment so that construction does not fail Reviewed-by: axis
| | | * | Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-032-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying the control environment also pops items from the original cleanup stack which is not owned by the control environment. This is a platform issue (and does not occur in 9.3 & 9.4). To avoid this causing a panic, the s60main is changed to not push items on the cleanup stack (instead, it TRAPs the call to main(), and deletes its allocations manually). A further 9.2 cleanup stack crash was caused when application construction fails (because of missing resource files). The resulting exception would bypass deleting the control environment, and return from main with the wrong cleanup stack active. This is resolved by doing the TRAP / cleanup / throw manually instead of using qt_trap_throwing (The control environment cannot be pushed to the cleanup stack, because it owns the cleanup stack at that time). This isn't a 9.2 specific bug, but rather is revealed by 9.2 because the missing resource file is non fatal in 9.3 and 9.4. Fixes many autotests which have crashed on S60 3.1 since the cleanup stack swapping patch. Reviewed-by: axis
| | | * | Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving function called without a TRAP Reviewed-by: Sami Merila
| | | * | Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was caused by S60 closing a handle under our feet when QApplication is destroyed. To avoid this, we open our own handle for the global lock instead of using the shared one inside CFbsBitmap. Also the global unlock/relock is not needed on S60 3.2 so this can be eliminated and save a few cycles (the function call was a no-op before) Reviewed-by: Jani Hautakangas
| | | * | Add the Symbian Foundation OS versionsShane Kearns2009-11-032-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian^1 - SV_SF_1 Symbian^2 - SV_SF_2 etc. This is for the benefit of developers working with the Symbian master codelines. Reviewed-by: axis
| | | * | QS60Style: impossible to open menu from styled QToolButtonSami Merilä2009-11-031-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style ignores toolButton's menu indicator rect. This means that the button's menu cannot be triggered by the user, as the style does not draw the indicator at all. With this fix, style calculates a rect (including margins) for menu indicator and draws that (arrow down) into toolButton (by making the button bevel larger). Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
| | | * | Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me