summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-154-2/+41
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4. Fixes tooltips for QGraphicsProxyWidget.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-154-2/+41
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes tooltips for QGraphicsProxyWidget.
| | * Fixes tooltips for QGraphicsProxyWidget.Yoann Lopes2010-04-154-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | Help event was not propagated to the widget. Also fixes tooltip value propagation when setting it on the proxy or on the widget. Autotest included. Task-number: QTBUG-5349 Reviewed-by: bnilsen
* | | '#' gets inserted to editor when changing FEP modesSami Merila2010-04-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is regression in QCoeFepInputContext::commitCurrentString. Recent member variable removal broke the existing functionality. Fixed by removing the orphaned return-statement. Task-number: QTBUG-9867 Reviewed-by: Alessandro Portale
* | | ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-04-151-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is partial fix to issue 9913. Now combobox popup is correctly positioned with AVKON StaCon (Combined Status and Control Pane). Popup is centered onscreen in this case. Task-number: QTBUG-9913 Reviewed-by: Janne Anttila
* | | Dialogs in landscape mode are not correctly positionedSami Merila2010-04-151-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If AVKON is using a StaCon component (combined Status and Control Pane), then dialogs were incorrectly positioned. Native side, places dialogs shown with StaCon to right border, whereas the current implementation was placing them to left. Fixed, by asking from AVKON the rect for StaCon. If it is empty, then use the existing placement rules, otherwise place to the right border. Task-number: QTBUG-9910 Reviewed-by: Janne Anttila
* | | Slider graphics does not look correct in N95 (part2)Sami Merila2010-04-151-1/+2
|/ / | | | | | | | | | | | | | | | | | | The original fix for this, only fixed horizontal widgets. But the same issue can be reproduced also with vertical widgets. This latter fix replaces the orginal fix. Task-number: QTBUG-9854 Reviewed-by: Alessandro Portale
* | Slider graphics does not look correct in N95Sami Merila2010-04-151-0/+1
|/ | | | | | | | | | | | The upscaling of theme graphics fails, if the original rect is taller than upscaled graphics rect height. This makes the start and end parts of the graphics appear as shorter then they should be. Fixed by forcing the destrination rect height to be used after upscaling the graphics. Task-number: QTBUG-9854 Reviewed-by: Janne Anttila
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-141-21/+23
|\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: HouseKeeping task QS60Style: In a very short combobox, text is cut QS60Style: Sometimes progressbars do not animate Implement OpenVG buffer scrolling and enable it on Symbian.
| * QS60Style: HouseKeeping taskSami Merila2010-04-141-10/+9
| | | | | | | | | | | | | | | | | | Remove unnecessary comment. Added one @todo comment. Some whitespace corrections. Removed unnecessary QStyle scopes. Reviewed-by: Alessandro Portale
| * QS60Style: In a very short combobox, text is cutSami Merila2010-04-141-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QComboBox is very short, it is possible that the combobox text is cut. This is due to two reasons: 1) Style does not take into account text eliding (which should be preferred over clipping) 2) Clipping text rect is done with orginal text rect, before it is adjusted for borders, icons etc. Style is changed that it doesn't use clipping rect and uses text eliding. Task-number: QTBUG-9837 Reviewed-by: Alessandro Portale
| * QS60Style: Sometimes progressbars do not animateSami Merila2010-04-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | Style removes every progressbar from animation list whenever *any* QWidget is hidden/shown. To ensure that the animation list is only tempered with possible animation supporting qwidgets, re-interpret cast them to QProgressBar. If this works, then clear the animation list. Task-number: QTBUG-9836 Reviewed-by: Alessandro Portale
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-142-3/+15
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
| * QAbstractScrollArea StyleSheet: fix drawing of border with ↵Olivier Goffart2010-04-142-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SH_ScrollView_FrameOnlyAroundContents - Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents is true. - We also reserved too much space for the border, as we included the native border as well in the computation, so do not reserve additional space by setting PM_ScrollView_ScrollBarSpacing to 0 Task-number: QTBUG-9821 Reviewed-by: jbache
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope
| * | Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | | | | | | | | | Reviewed-by: Harald Fernengel
* | | Not possible to show selected text in virtual keyboardSami Merila2010-04-131-2/+13
|/ / | | | | | | | | | | | | | | | | | | In Sym^3 when virtual keyboard is opened, text selection is not carried over from editor-like widget to the VKB. This is due that new implementation of AVKON FEP manager requires that clients indicate with editor flags that they can handle text selection. Task-number: QT-3277 Reviewed-by: Janne Anttila
* | QS60Style: Single Click UI support for SD 9.2 time-boxSami Merila2010-04-133-53/+170
|/ | | | | | | | | | | | Final commit for this task. For widgets that use the highlighted list/table graphic, style now supports pressed state for the highlight. Style filters mouse press and release events and sets the highlight graphics to be correct based on mouse events (i.e. touch) it gets. Task-number: QT-2298 Reviewed-by: Alessandro Portale
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-121-1/+1
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: CSS: fixes border only affecting the first widget. fix closing state in QLocalSocket on Windows
| * CSS: fixes border only affecting the first widget.Olivier Goffart2010-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rules like "Foo { border: 2px solid; }" does not specify the border color. When the border color is not specified, it is assumed to be black. When reading the brush value from the cache, we should take that into account. Note that this logic cannot be moved into brushFromData() as it is different for the background. (when no color is specified, it is assumed to be transparent) Reviewed-by: jbache Task-number: QTBUG-9674 (part one)
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-121-1/+1
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix segfault, if QPixmap::loadFromData() fails
| * Fix segfault, if QPixmap::loadFromData() failsJohannes Zellner2010-04-121-1/+1
| | | | | | | | Reviewed-by: Harald Fernengel
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-121-2/+4
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash with QTextEdit::textChanged() when deleting a character
| * Fix crash with QTextEdit::textChanged() when deleting a characterEskil Abrahamsen Blomfeldt2010-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit::textChanged() will be emitted from a function called from within QTextCursorPrivate. If the code connected to textChanged() makes a local copy of the current text cursor and then causes it to detach, we will crash when returning to QTextCursorPrivate and trying to access the now-deleted data. To avoid this, we make a local reference to the current text cursor that gives us a guarantee that it will be valid throughout the delete-call. Task-number: QTBUG-9599 Reviewed-by: Gunnar
* | Fix problem with accessibility clients not getting info from QFileDialogAndy Shaw2010-04-111-0/+36
| | | | | | | | | | | | | | | | This fixes a problem with accessibility and QFileDialog, in addition the fix to complexwidgets.cpp will also fix any itemview that uses a root index. Reviewed-by: Jan-Arve
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-098-24/+57
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable preserved swap behavior when surface is created due to resize. Generate triggered signal even the action launches menu in Symbian. Symbian emulator: unload file server so apps can be recompiled. Clear QFontCache TLS content before nullifying TLS pointer. Fixed focus and window activation events on Symbian when opening menu. QTBUG-4887 and other exception safety fixes
| * Generate triggered signal even the action launches menu in Symbian.Janne Anttila2010-04-091-8/+8
| | | | | | | | | | | | | | | | | | | | | | Triggered signal is useful for detecting native 'Options' menu launches in Symbian. QMenu::aboutToShow event is currently also not generated, but that is part of another bug report. And QMenu::aboutToShow would not even be generated for 'Options' menu itself but only for its sub/cascade menus. Task-number: QTBUG-9669 Reviewed-by: Sami Merila
| * Clear QFontCache TLS content before nullifying TLS pointer.Janne Koskinen2010-04-081-1/+3
| | | | | | | | | | | | | | | | If not cleared server handles are left open causing Font Server to Panic with KErrInUse in Symbian. Task-number: QTBUG-9565 Reviewed-by: Simon Hausmann
| * Fixed focus and window activation events on Symbian when opening menu.Janne Anttila2010-04-084-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in QTBUG-8698, Qt for Symbian has been generating incorrect focus and window activation events. This has happened since launching menu from QSoftkeyManager with TryDisplayMenuBarL, invokes eventually QSymbianControl::FocusChanged. But when the FocusChanged is called menu being launched is not yet set to visible, meaning that IsDisplayingMenuOrDialog returns false. Because there is no way in platform to detect that menu is being launhced, the fix is to add a new flag QS60Data, which can be used to detect if FocusChanged event is received due to the fact that menu is being constructed/launched. Task-number: QTBUG-8698 * Fixes issues 2, 3 and 4 Reviewed-by: Sami Merila
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-074-11/+26
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QTBUG-4887 and other exception safety fixes
| | * QTBUG-4887 and other exception safety fixesmread2010-04-074-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes a fix for QTBUG-4887 and other exception safety problems found while testing it. The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on failure like a proper class should, instead it tries to fail "nice". What happens here is that setAlphaChannel would crash on OOM as after the convertToFormat call, d could be NULL. This new version checks the result of the conversion before using it. The other fixes are all cases where exceptions were thrown from destructors. I added code to the test app to help debug these cases, and I fixed all the problems I found. With these changes, tst_exceptionsafety_objects runs and passes on the Symbian emulator. Reviewed-by: Shane Kearns
* | | Fixes CursorChange and TooltipChange events delivery for QGraphicsWidgetYoann Lopes2010-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the documentation mentions, these two events are delivered respectively after the cursor has changed and after the tooltip has changed. These two events were previously delivered just before. This patch is needed for fixing QTBUG-5349 even if it is not directly related. Auto-test included. Reviewed-by: bnilsen
* | | QTableView: fix spans corruption when removing spans.Olivier Goffart2010-04-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | - We should not do -1 after erasing, as it is done later on. - We should consider the 0 height even if it is not the last span. - Added an assert. Task-number: QTBUG-9631 Reviewed-by: Gabriel
* | | Fixes painting artifacts when scaling a QGraphicsProxyWidget.Yoann Lopes2010-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Incorrect simple conversion of the exposed rect from QRectF to QRect when rendering the widget. Task-number: QTBUG-7296 Reviewed-by: bnilsen
* | | Fix <MemLeak> valgrind report shows memory leak for QImage::save().Stefano Pironato2010-04-071-0/+1
|/ / | | | | | | Reviewed-by: Marius Storm-Olsen
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash for multiscript text in QTextEngine::boundingBox()
| * Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The logClusters pointer is already adjusted for the item, so it should be indexed relative to the item, hence from 0 to itemLength-1. Adding pos to the index would give us a random value for all script items > 0. Thus this would sometimes crash for text that spanned several scripts, since we would sometimes get a value back which was outside the bounds of the glyph array. Task-number: QTBUG-9374 Reviewed-by: Samuel
* | Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
| | | | | | | | | | | | | | | | | | | | | | During softkey refactoring this piece of code get changes, but the changed code did not work correctly if window had no softkey actions. Switched back to old way where softkey source is stored to variable, and windowType is asked from stored variable. If softkey source is dialog or popup, "Exit" is not added automatically to RSK. Task-number: QT-2203 Reviewed-by: Sami Merila
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-052-0/+32
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implementing QFontEngineS60::getSfntTableData()
| * | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That function was not yet implementing. Its absense caused some Harfbuzz based shaping not to happen. See Robert DeWolf's comment on task QTBUG-5857 Since QFontEngineS60 is private implementation and generally not exported, no symbols need to be added to the .def files for this patch. Task-number: QTBUG-5857 Reviewed-by: trustme
* | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| | | | | | | | | | | | | | | Merge-request: 544 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | Fix crash in the fileiconprovider for WindowsJens Bache-Wiig2010-04-011-2/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | In some cases the fileiconprovider has been reported to crash while accessing icons with overlays. This situation got worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268 since these cases were often hidden by broken caching. The workaround for now is to simply check that the hIcon structure is non empty before converting the icon. Task-number: QTBUG-8324 Reviewed-by: ogoffart
* | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-311-1/+2
|/ | | | | Merge-request: 541 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-3110-255/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Add a children private property needed for QML to support QGraphicsObject" Revert "struct -> class, it's better." Revert "Add NOTIFY to size property so QML bindings are working fine." Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes" Revert "Add a a layout property in QGraphicsWidget." Add a workaround for a bug in Mac filesystem watcher. Another "off by 1" problem in OpenVG - in paths this time. Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs. Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
| * Revert "Add a children private property needed for QML to support ↵Alexis Menard2010-03-316-245/+0
| | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject" This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drops the support of QML on top of 4.6
| * Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| | | | | | | | This reverts commit 1d094129c0c3994df4e59cd9eda6981a7b131903.
| * Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-312-9/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drop the support of QML on top of 4.6
| * Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry ↵Alexis Menard2010-03-312-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | changes" This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp Drop the support of QML on top of 4.6
| * Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-312-3/+0
| | | | | | | | | | | | This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311. This drop the support of QML on top of 4.6
| * Add a workaround for a bug in Mac filesystem watcher.Alexis Menard2010-03-301-1/+1
| | | | | | | | Reviewed-by:TrustMe
generated by cgit v0.12 at 2024-10-24 13:23:42 (GMT)