summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-252-19/+6
|\
| * Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-11-252-19/+6
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2axis2009-11-241-1/+1
| | |\
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-242-19/+6
| | |\ \ | | | | | | | | | | | | | | | 4.6-staging2
| | | * | Removed window activation hack, unified and fixed title&icon setting.Janne Anttila2009-11-232-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window activation hack is not needed anynmore since AppUi()->RemoveFromStack() ensures the next visible window will get the keyboard focus. Hack removal also required change to window title setting logic. Since window title (and icon) are associated to top-level windows, the logical place to set them is the same place where active window is changed i.e. QApplication::setActiveWindow is called. At the same time also window icon setting from show_sys was move to focusChanged to make icon/title setting more consistent. When changing orientation or switching to different statuspane mode we receive KInternalStatusPaneChange events for each window in QSymbianControl::HandleResourceChange. When receiving such event we only need to reset the icon for focused/visible window. If we don't handle it like this, it might happen that invisible widget added to control stack resets the global icon/title. Task-number: QTBUG-5780 Reviewed-by: Axis
| * | | | Merge commit '0d20ec8604b318ceafd6c35dfe1d73519bf024d3' of oslo-staging-1 ↵Simon Hausmann2009-11-254-10/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 4.6
| * | | | | 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)
* | | | | Cocoa: 'Quit' in menu bar does not workRichard Moe Gustavsen2009-11-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have two window, each with its own menu bar that has a 'Quit' action, we reuse the quit menu item when switching between the windows. Now, it we deleteLater one of the menu bars, the new menubar will update the 'Quit' item just before deleteLater will come along and remote the update again. This patch will fix this. Task-number: QTBUG-4684 Reviewed-by: Prasanth
* | | | | Fix the tablet device recognition on WindowsBenjamin Poulain2009-11-251-84/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unique ID was not taking into account the bits 4, 5, 6, 7 of CSR_TYPE. Those bytes identify similar devices with different flavor/color. The cursor data were also not updated correctly. The information were only updated if the pointer type changes (e.g.: pen to eraser) but not if the physical device change (e.g. stylus to brush). The information are now updated every time a proximity event has a new unique ID. Reviewed-by: Denis Dzyubenko Task-number: QTBUG-1930
* | | | | We don't need to initialize multitouch in non-gui applications.Denis Dzyubenko2009-11-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme Patch-by: raipriha
* | | | | Fixes implicit grabbing in Qt/CocoaDenis Dzyubenko2009-11-242-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
* | | | | Maximizing a window makes it a bit smaller that the minimum size:CocoaPrasanth Ullattil2009-11-241-2/+7
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When returning preferred sizes for the frame, we should consider the size for non client area elements like frame, tittlebar etc. Task-number: 6090 Reviewed-by: Denis
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-242-3/+9
|\ \ \ \ | |/ / /
| * | | Merge commit '4ea54f03174778a4efdcb802f9179b6e1d17fd88' of oslo-staging-1 ↵Simon Hausmann2009-11-241-1/+1
| |\ \ \ | | |/ / | |/| | | | | | into 4.6
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-232-3/+9
| |\ \ \ | | | |/ | | |/|
| | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-205-32/+53
| | |\ \
| | * | | Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the examples/demos that used a QGraphicsView with a QGLWidget as a viewport, that had multisampling enabled, was broken after 7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented QGLWidget will be forced to use the parent widget's visual, which in this case does not contain any multisample buffers. The QX11Info structure for QGLWidget is put together based on the QGLFormat that is passed into the QGLWidget constructor and will in most cases always be different from the parent widget visual. Task-number: QTBUG-5998 and QTBUG-6003 Reviewed-by: Eskil
| | * | | avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5804 Reviewed-by: denis
* | | | | 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: added some useful comments onlyRichard Moe Gustavsen2009-11-231-0/+3
| |_|_|/ |/| | |
* | | | Cocoa: apps with dialogs hangs on exitRichard Moe Gustavsen2009-11-231-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happends because we refuse to exit if we have a modal dialog showing on screen. After some discussion, we decided that we need to allow to exit if the quit menu item is enabled. Some of the reason behind this is the way developers tend to (mis)use dialogs as normal windows in Qt. So, if you don't want your app to exit when showing a modal dialog, disable quit menuitem, or handle QCloseEvent. Task-number: 5613 Reviewed-by: MortenS
* | | Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 ↵Simon Hausmann2009-11-231-1/+1
|\ \ \ | |_|/ |/| | | | | into 4.6
| * | Incorrect DropAction returned by QDrag::exec() on Cocoa.Prasanth Ullattil2009-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The action performed by the latest drag and drop operation is stored in the global DnDParams structure. The QDrag::exec() return value has to be fetcted from this global variable instead of the temporary copy on stack. Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this. Task-number: QTBUG-6001 Reviewed-by: Denis
* | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-201-1/+1
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-201-1/+1
| |\ | | | | | | | | | 4.6-staging2
| | * Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-6011 Reviewed-by: Gareth Stockwell
* | | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-195-32/+53
|\ \ \ | |/ / |/| |
| * | Fix compilation of Embedded with GLib.Thiago Macieira2009-11-181-2/+1
| | | | | | | | | | | | | | | | | | You have to link to Glib if you're using it... Reviewed-by: Peter Hartmann
| * | Fixes in the multitouch handling.Denis Dzyubenko2009-11-184-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filling in touch point data for delivering to widget don't use the setter methods to avoid unnecessary detaches. Making it not detach also allows not to re-calculate widget-relative start position and last position on each delivery step. Also use the QWeakPointer to store a pointer to a widget that expects to receive a touch event, so that if the widget is destroyed we'll get notified. Reviewed-by: Bradley T. Hughes
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-184-23/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure.exe
* | \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-193-7/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Ran the script utils/normalizeOlivier Goffart2009-11-182-3/+3
| | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-181-4/+5
| |\ \ \ | | | | | | | | | | | | | | | 4.6-staging2
| | * | | QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get a mobile friendly 1-column layout, we can set QFormLayout's rowWrapPolicy. S60Style should return QFormLayout::WrapLongRows as the SH_FormLayoutWrapPolicy styleHint. Reviewed-by: Jason Barron
* | | | | Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis
* | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-181-2/+4
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | Conflicts: configure.exe
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-174-17/+50
| |\ \ \
| * | | | doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5432
* | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-183-21/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-173-21/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fix warningOlivier Goffart2009-11-161-1/+1
| | | |
| | * | Remove fake right mouse button events from long tapShane Kearns2009-11-132-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The context menu is launched by a separate event, not by the right mouse button. Generating the fake right mouse button caused side effects. We now treat the touch screen as a one button mouse, long taps still open the context menu using QContextMenuEvent. Task-number: QTBUG-5180 Reviewed-by: axis
* | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-179-27/+78
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-175-10/+28
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fixed swipe gesture on the Mac.Denis Dzyubenko2009-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Swipe on Mac is a singleshot gesture which goes directly to the finished state (fake gesture started event will be sent by Qt in this case). Reviewed-by: Richard
| | * Designer crashes in Mac Cocoa port.Prasanth Ullattil2009-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we reparent a widget, it has to be removed from the old view before it is added to the new one. Otherwise this can cause the old view to have an invalid first responder, causing crash. Task-number: QTBUG-5327 Reviewed-by: Denis
| | * Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-132-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | When enabling/disabling a widget or changing its InputMethodEnabled attribute, use the focus proxy widget's input context for reset and for setting the focus widget on the input context. Task-number: QTBUG-5781 Reviewed-by: Denis
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-136-15/+39
| | |\
| | * \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1312-12/+12
| | |\ \
generated by cgit v0.12 at 2025-01-07 20:07:43 (GMT)