summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1462-22012/+19733
|\
| * Improve scissor clipping in the OpenVG engineRhys Weatherley2009-10-131-0/+4
| | | | | | | | | | | | | | | | If the scissor is being used to clip instead of the mask, use the bounding rectangle of the clip path if it cannot be handled as a simple rectangle. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-131-1/+7
| |\
| | * Don't create too many window surfaces in DFBAnders Bakken2009-10-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Since DirectFB handles the composition for us we don't need to invalidate anything when moving a window. Only on resize do we want another paint event. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Make sure we don't repaint when moving a windowAnders Bakken2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the QDirectFBWindowSurface returns true for isBuffered(). Otherwise QWSWindowSurface will force a repaint when moved. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Explicitly request the alpha mask in the EGL configurationRhys Weatherley2009-10-131-0/+4
| |/ | | | | | | | | | | | | | | The EGL implementation used in S60/NGA for OpenVG does not return a configuration with alpha masking unless it is explicitly requested. Reviewed-by: Julian de Bhal
| * Work around broken ATI X1600 drivers on Mac OS XGunnar Sletta2009-10-131-1/+19
| | | | | | | | | | | | | | | | | | | | The GLSL implementation messes up return values from functions so that all our srcPixel()'s become black and several matrices are off. We don't want to rewrite the shader code to fit an "ancient" graphics card, so we simply fall back to the GL 1 engine. Reviewed-by: Trond (cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88)
| * Modified QSymbianControl::setFocusSafely to set last focused controlGareth Stockwell2009-10-131-1/+2
| | | | | | | | | | | | to zero only if currently focused Reviewed-by: axis
| * Mac: fix autotest for qcolordialogRichard Moe Gustavsen2009-10-131-1/+3
| | | | | | | | Rev-By: olivier
| * crash fix on WinCE without gesture supportMaurice Kalinowski2009-10-131-3/+6
| | | | | | | | | | | | | | | | | | dd9d8693 added some checks causing SetGestureConfig to not be initialized to 0. Thus it gets derefenced and causes crashes on all WinCE applications. Reviewed-by: denis Reviewed-by: ninerider
| * *Completely new* EABI DEF files for Symbian OSIain2009-10-1311-20796/+18739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: - refrozen from scratch without any of the autotest exports (To spell it out: there is no BC between anything built against these DEF files, and anything built with previous versions of the DEF files) - no autotest exports in this set, so no good for autotests - it is very likely that the DEF files will be reworked again before release, meaning that anything built against these ones won't be BC with the 4.6.0 final release (so don't expect your apps built against the beta to work against the final release) - finally added a DEF file for WebKit Reviewed-by: TrustMe Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtScriptu.def src/s60installs/eabi/phononu.def
| * Temporary workaround to get WebKit to pick up DEF file from std locationIain2009-10-131-0/+13
| | | | | | | | | | | | | | Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| * Mac: small bugfix to the mac gesture implementationRichard Moe Gustavsen2009-10-131-0/+6
| | | | | | | | | | | | | | | | Make sure that we cancel the pan gesture if the user starts to press several fingers on the trackpad, and the gesture has not yet got a chance to start Rev-By: trustme
| * Fixed the QKeyEvent::nativeModifiers() call.axis2009-10-131-1/+1
| | | | | | | | | | | | | | Earlier we returned a copy of the Qt modifiers. This patch fixes the call to return the real native Symbian one. RevBy: Sami Merila
| * Mac: small code fix-up for the gesture commit 5 min ago.Richard Moe Gustavsen2009-10-131-2/+5
| | | | | | | | Rev-By: trust me
| * Mac: implement gestures conforming to the new APIRichard Moe Gustavsen2009-10-136-17/+392
| |
| * Carbon: QApplication auto test shows bug in event dispatcherRichard Moe Gustavsen2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the bug is that we call _quit_ on the eventloop just _after_ posting the deffered delete event (from inside deleteLater function, ref the test where it fails, tst_qapplication.cpp:1242). And the point is, even if the loop level tells us that we _can_ delete the object in this case, the 'quit' tells us that we should not process _any_ events (until we get a call to processEvents again). So this patch makes sure that we don't call sendPostedEvents from the eventDispatcher if it is interruped. Rev-By: brad
| * Second attempt: Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-134-4/+7
| | | | | | | | | | | | | | The previous commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5 included some changes which were not meant to be pushed. Reviewed-by: TrustMe
| * Revert "Fixed a few compiler warnings from QtGui for Symbian."Janne Anttila2009-10-137-16/+11
| | | | | | | | | | | | Accidentally used git commit -a when should have used only git commit :( This reverts commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5.
| * Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39Jocelyn Turcotte2009-10-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
| * Remove heuristic mask from S60 cursor to match other platformsShane Kearns2009-10-131-12/+12
| | | | | | | | | | | | | | | | | | | | | | S60 port was supporting QCursor(QPixmap) where the pixmap didn't have any mask or alpha channel, and generating a mask using QPixmap::heuristicMask. Now changed to draw the cursor opaque in this case, which matches the behaviour on other platforms. Also it failed horribly with shaded backgrounds e.g. draggable icons demo Task-number: QTBUG-4761 Reviewed-by: axis
| * Merge qt-team-widgets/4.6 into origin/4.6Olivier Goffart2009-10-1311-130/+340
| |\
| * | Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-137-11/+16
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-132-1/+4
| |\ \
| | * | Doc: clarified what addDatabase() returns if the driver cannot be loadedStian Sandvik Thomassen2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If the driver cannot be loaded, isValid() returns false. Reviewed-by: Bill King
| | * | Fixes issue with multiple lookups to same table/fieldBill King2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the renaming scheme created a new table_field alias name. If multiple references referred to the same table/field lookup, then multiples of the same alias would be generated in the query, leading the query to fail. Reviewed-by: Justin McPherson
| * | | Implement qDrawPixmaps for the OpenVG paint engine.Rhys Weatherley2009-10-132-0/+117
| |/ / | | | | | | | | | | | | | | | | | | Best performance will be acheived with OpaqueHint and drawing the full pixmap rather than sub-regions. Reviewed-by: trustme
| * | Remove the surface holder from the PowerVR screen driverRhys Weatherley2009-10-134-148/+11
| | | | | | | | | | | | | | | | | | | | | The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't needed any more and was never very stable anyway. Reviewed-by: trustme
| * | Update the OpenGL for Qt/Embedded documentationRhys Weatherley2009-10-131-0/+6
| | | | | | | | | | | | Reviewed-by: trustme
| * | Remove the hybrid screen driver.Rhys Weatherley2009-10-127-961/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The hybrid screen driver purports to implement OpenGL, but it uses an obsolete method of integration that confuses people who find it in the source tree. The current reference implementation is "powervr". Reviewed-by: trustme
| * | Fix save() and restore() for the OpenGL2 paint engine.Rhys Weatherley2009-10-122-13/+15
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-4822, QTBUG-4824 Reviewed-by: Sarah Smith Reviewed-by: Samuel
| * | Doc: Minor corrections and additions to i18n documentation.David Boddie2009-10-121-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Gesture API documentation review.David Boddie2009-10-126-80/+124
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fix default action in s60 drag'n'drop managerShane Kearns2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default action was always MoveAction, which removed the data from the source widget, even if not accepted anywhere. Now uses the default action from the base class manager. Task-number: QT-736 Task-number: QTBUG-4356 Reviewed-by: Aleksandar Sasha Babic
| * | Make QTextControl give the right default action to Drag managerShane Kearns2009-10-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dragging text from a non editable widget, QTextControlPrivate was passing allowed actions = CopyAction, default action = MoveAction. Default action is always used if you don't press any modifier keys, so text could be moved (cut) out of a non editable widget such as QLabel Task-number: QTBUG-4356 Reviewed-by: Aleksandar Sasha Babic
| * | Fix for poor performance during screen orientation switchShane Kearns2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing the relayout takes longer than 100ms. Setting priority to low makes the app wait until all other apps have been processed before it gets scheduled again (over 3 seconds). By setting priority to background, the app is round-robin scheduled with the other apps (in 20ms timeslices) Task-number: QT-1030 Reviewed-by: axis
| * | Make writing out word-spacing use the right property.Thomas Zander2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ODF seems to not specify this property, while xslt (which odf copied for this) does, writing it out will be much more useful than loosing the info silently, though. Reviewed-by: Denis Dzyubenko
| * | Fixed a bug visible in QPrintPreview with the X11 XLFD font engine.Trond Kjernåsen2009-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | QFontEngineXLFD::boundingBox() function did not take justification into account when calculating the bounding box for a set of glyphs. Reviewed-by: Eskil
| * | QHttpNetworkConnectionChannel: Limit the socket read bufferMarkus Goetz2009-10-121-0/+5
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | Added documentation for the Gesture API.Denis Dzyubenko2009-10-128-28/+278
| | | | | | | | | | | | Reviewed-by: trustme
| * | Added support for singleshot gestures.Denis Dzyubenko2009-10-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a gesture recognizer claims to be in Finished state without any Triggered states before, that probably means that was a singleshot gesture that has started and ended right away, so we'll send a fake gesture in the GestureStarted state. Reviewed-by: trustme
| * | Fix for qapplication::testDeleteLaterProcessEvents autotest in Symbian.Janne Anttila2009-10-122-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting qt_desktopWidget eventually ends up to QSymbianControl destructor. Calling setFocusSafely from QSymbianControl destructor causes a new events to be posted to event queue. Posting events tries to wakeup event dispatcher, which was deleted in QApplication destructor before calling delete for qt_desktopWidget. This makes application to panic. The fix is to change is_app_closing and is_app_running flags to correct state immediately after event dispatcher is closed down, and check the is_app_closing flag in QSymbianControl destructor. The change fixes panic in qapplication::testDeleteLaterProcessEvents, and otherwise QApplication and QWidget autotest results are same as before change. Reviewed-by: Miikka Heikkinen Reviewed-by: Brad
* | | Make the autotest pass for descending order in QTableWidgetPierre Rossi2009-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | It failed after this commit: 19030e2af098e319e3c3f3883c51e28364bf3ccf Reviewed-by: ogoffart
* | | Sorting bug in QTableView fixPierre Rossi2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the DisplayRole is identical for two or more items, any modification of one item (e.g. backgroundColorRole) may trigger a re-ordering, which is obviously not an behaviour to be expected. Same fix as the one used for QTreewidget in c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02. Task-number: QTBUG-4856 Task-number: 262056 Reviewed-by: Olivier Goffart
* | | Fix sorting after changing a QTableView's headerOlivier Goffart2009-10-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the sorting states in sync with the header when setting custom headers Reviewed-by: Gabriel Task-number: QTBUG-3128 task-number: 234926
* | | Fix QUrl regression with setHost("::ffff:129.144.52.38")David Faure2009-10-131-2/+7
| | | | | | | | | | | | | | | | | | | | | toEncoded was returning an empty host instead of [::ffff:129.144.52.38] Merge-request: 1735 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | | QMetaObject::activate: reordered mutex locks/unlocks around spyFlorian Vichot2009-10-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Always call the callbacks unlocked to avoid deadlocks. (The others call to the callback ar unlocked) Reviewed-by: Olivier Goffart Merge-request: 1744
* | | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-131-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When making a rubber band selection while Control is pressed in an itemview with extended selection, make sure that the selection state of the items inside the rubber band is toggled. This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30 Merge-request: 1759 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Gabriel Task-number: QTBUG-1435 Task-number: 191545
* | Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6Alexis Menard2009-10-1259-1391/+2041
|\ \ | |/
| * Compile fix after the latest change to gesture api.Denis Dzyubenko2009-10-121-8/+1
| | | | | | | | | | | | Forgot to remove the declaration from a source file because of a bad merge. Reviewed-by: Bradley T. Hughes