summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6Alexis Menard2009-10-1259-1391/+2041
| |\
| * | Fixed keyboard navigation for QTableViewGabriel de Dietrich2009-10-123-71/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard navigation didn't work in the following cases: - The last column was disabled and we pressed the tab key when at the 2nd last column. (See ref. task). - Spans with their anchor column or row hidden or disabled. - Navigation would not preserve the original row/column when traversing a span horizontally/vertically. Auto-tests submitted with this commit. Task-number: QTBUG-3878 Reviewed-by: Olivier
| * | Update lastTick on all timerTicks in QAbstractAnimationLeonardo Sobral Cunha2009-10-091-7/+4
| | | | | | | | | | | | | | | | | | | | | This is needed in case we change consistentTime while the animation is running. Reviewed-by: thierry
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-0925-128/+218
| |\ \
| * | | Fixed a potential crash in QGraphicsScenePrivate::_q_polishItems()J-P Nurmi2009-10-092-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch make sure that we always start from the beginning of the unpolished items list and we erase the first value at each iteration. The patch also convert the list to a set that is more appropriate here. Merge-request: 1707 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | | Fix context menu and menu key in QGraphicsView.Alexis Menard2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a weird bug when pressing the menu key on a proxy that embed a lineedit (but the proxy don't have the focus). At each time the key was pressed a context menu was created. When we press the menu key, QWidgetMapper will create a context menu event that will be sent to the QGraphicsView and will end up in QGraphicsScene. QGraphicsScene will then try to find all items under the mouse and will try to find any item from this list that accept this contextMenuEvent. In our case the proxy will always accept it and therefor will always send it to the widget that it owns and that's why we had this infinite numbers of QMenu. In QWidget world the context menu event is always sent to the widget that has the focus. If you checked any QWidget subclasses you'll see that all of them assume that when they get a context menu event everything is fine focus wise. We could have changed QGraphicsScene::contextMenuEvent but this will breaks some existing code. Instead we just checked that QGraphicsProxyWidget has the focus before we actually send the contextMenuEvent to the widget it owns. I have modified an existing auto-test to cover that. Be careful widget->setContextMenuPolicy(Qt::ActionsContextMenu) means that you will get no contextMenuEvent. :D. In this test i cover the standard use case and the one with Qt::ActionsContextMenu with and without the focus on the proxy. Task-number:QTBUG-3787 Reviewed-by:jan-arve
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-0833-239/+368
| |\ \ \
| * | | | In QParallelAnimationGroup, only stop the children if they arent stoppedLeonardo Sobral Cunha2009-10-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was settingCurrentTime on all animatios, even on those that had already finished long ago. Reviewed-by: thierry
| * | | | Avoids timer ticks when there are only pause animations runningLeonardo Sobral Cunha2009-10-074-47/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are only pause animations running, the timer will stop and restart when the closest pause animation finishes. While there are only pause animations running, there are no additional timer ticks, but if there is at least one animation running that is not a group or a pause, then the global animation timer will restore it's update interval. Includes a new auto-test for the QPauseAnimation class. Task-number: QT-941 Reviewed-by: thierry Reviewed-by: janarve
| * | | | Removed unused function QUnifiedTimer::elapsedTime from animation api privateLeonardo Sobral Cunha2009-10-071-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thierry
| * | | | In QAbstractAnimation::setState setCurrentTime when animation pausesLeonardo Sobral Cunha2009-10-071-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we want to avoid timer ticks in QPauseAnimation, We need to update the current time when an animation pauses, for being able to resume correctly. Reviewed-by: thierry
* | | | | 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
* | | | 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
* | | | Fixed warnings autotest.Denis Dzyubenko2009-10-122-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
* | | | Removed the QGesture contructor that we don't really need.Denis Dzyubenko2009-10-122-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor that accepts a gesture type is not needed because the gesture type id will be generated by Qt and assigned to the QGesture object when a custom gesture recognizer is registered within the framework. Reviewed-by: trustme
* | | | Fixed enum values in Qt::GestureContext.Denis Dzyubenko2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only reason to refer to values from the Qt::ShortcutContext enum is to avoid confusing people since enum value names look similar so we want to avoid weird behaviour when mixing them. But referring to another enum value makes the documentation look weird as it mentions different unrelated enum value in the GestureContext doc. Reviewed-by: trustme
* | | | Revert merge commit 3945fd75a93d790434b33c2d23aOlivier Goffart2009-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | The resolution of conflicts introduced regressions. And the commit was already in 4.6
* | | | QUuid::createUuid() not unique when using threads on UnixBradley T. Hughes2009-10-122-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUuid::createUuid() only seeds the PRNG on the first entry, but since it's using qsrand() and qrand(), all other threads will use the default seed, and thus generate the exact same UUIDs. Fix this by adding an internal function (qsrand() overload with no args) which seeds the PRNG if it hasn't been done already, and use a seed that is based on current time, a stack address and a global serial counter (so that the chances of 2 threads using the same seed are as low as possible). Task-number: QTBUG-3543 Reviewed-by: Marius Storm-Olsen
* | | | Don't delete an fbo's texture if the fbo isn't using a textureRhys Weatherley2009-10-122-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also, unbind the texture after it is initialized. Reviewed-by: Sarah Smith
* | | | 2009-10-09 Joe Ligman <joseph.ligman@nokia.com>Joe Ligman2009-10-117-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Hausmann. Sets Qt::WA_InputMethodEnabled and Qt::ImhHiddenText for password fields in EditorClientQt setInputMethodState. This change is needed so widgets such as the s60 software input panel can receive input method events for password fields. It's up to the Qt platform to determine which widget will receive input method events when these flags are set. Also added implementation for setInputMethodEnabled and setInputMethodHint to QGraphicsWebViewPrivate and QWebViewPrivate. This change removes the direct dependency on QWebView and uses QWebPageClient. Added autotest to tst_qwebpage.cpp https://bugs.webkit.org/show_bug.cgi?id=30023 * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::setInputMethodEnabled): (QGraphicsWebViewPrivate::setInputMethodHint): * Api/qwebview.cpp: (QWebViewPrivate::setInputMethodEnabled): (QWebViewPrivate::setInputMethodHint): * WebCoreSupport/EditorClientQt.cpp: (WebCore::EditorClientQt::setInputMethodState): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): 2009-10-09 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Simon Hausmann. [Qt] Added pure virtual methods setInputMethodEnabled and setInputMethodHint to QWebPageClient https://bugs.webkit.org/show_bug.cgi?id=30023 * platform/qt/QWebPageClient.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49397 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | | Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-10-102-5/+6
|\ \ \ \
| * | | | Fixed getting an icon for a file on the filesystem with gnome.Denis Dzyubenko2009-10-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation gnome_icon_lookup_sync() can return an absolute file path for the icon, so we check if the returned string starts like a path, then we load the icon from the file. This also fixes compilation warnings. Reviewed-by: Olivier Goffart
| * | | | Fixed compilation warning by removing unused variables.Denis Dzyubenko2009-10-091-2/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme