summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-239-9/+20
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-237-8/+17
| |\
| | * Fixes painting issues when scaling a QGraphicsView.Yoann Lopes2009-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the 'exposed rectangle' passed to the Item's paint() function was rounded to Int values, whereas the one passed to drawBackground and drawForeground was not. Autotest included. Task-number: QTBUG-5859 Reviewed-by: bnilsen
| | * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-206-34/+53
| | |\
| | * | Revert "Do not extend the last toolbar in a line when moving it"Thierry Bastian2009-11-202-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | make a real fix for the problem is defaulting to sizehint when there is no preferred size set (ie the toolbar hasn't been moved) This reverts commit a2c247ed521d88f99a21b4207cdff8ea03e949be.
| | * | Do not extend the last toolbar in a line when moving itThierry Bastian2009-11-202-5/+7
| | | |
| | * | Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-6004
| | * | 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
| | * | Fix for tabwidget usesScrollButton being overriden by stylesheetOlivier Goffart2009-11-202-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a stylesheet or reparenting a widget into a widget using style sheet would cause the usesScrollButtons to be reset. Instead we now keep the flag whenever it has been explicitly set by the user rather than querying from the style again. Task-number: QTBUG-3370 Reviewed-by: jbache
| * | | Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 ↵Simon Hausmann2009-11-232-1/+3
| |\ \ \ | | |_|/ | |/| | | | | | 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
| | * | Marking the shmid segment to be destroyed. It prevents leaks when the app ↵Simone Fiorentino2009-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes Merge-request: 2080 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | On Windows CE the native menubar must not be used. The corresponding flag was never set for Windows CE. Task-number: QT-2530 Reviewed-by: Maurice
* | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-2014-41/+164
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-205-5/+82
| |\ | | | | | | | | | 4.6-staging2
| | * QAbstractSlider: keypad navigation is slow.Frans Englich2009-11-192-4/+74
| | | | | | | | | | | | | | | | | | | | | Add logic to make keypad navigation faster when auto repeating. Task-number: QTBUG-5988 Reviewed-by: Gareth Stockwell
| | * Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-6011 Reviewed-by: Gareth Stockwell
| | * Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-192-0/+7
| | | | | | | | | | | | | | | | | | | | | Missing virtual function now implemented Task-number: QTBUG-5977 Reviewed-by: axis
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
| |\ \
| | * | Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| | * | Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| | | | | | | | | | | | | | | | Reviewed-by: leo
| * | | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl
| * | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-191-8/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-4334 Reviewed-by: ogoffart
| * | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-191-1/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-1976 Reviewed-by: Gabi
| * | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-197-55/+98
| |\ \
| * | | Mark QGraphicsItemAnimation as deprecatedThierry Bastian2009-11-191-0/+1
| | |/ | |/| | | | | | | Task-number: QTBUG-5968
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-191-1/+1
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
* | | | 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
| * | | | Merge branch '4.6' into 4.6-stagingThiago Macieira2009-11-184-44/+66
| |\ \ \ \
| * | | | | 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-1819-44/+54
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
* | | | | | | Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
* | | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1934-179/+245
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Ran the script utils/normalizeOlivier Goffart2009-11-1821-106/+106
| | | | | | | | | | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| * | | | | MAke a readonly QLineEdit not show "write" actions in its context menuThierry Bastian2009-11-181-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2494 Reviewed-by: Gabriel
| * | | | | QListView: fixes skipping one item in pageDown(Up)Leonardo Sobral Cunha2009-11-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was scrolling down (number of visible items in viewport) + 1 and this was leading to one item being skipped while doing page down (the same also happened for page up). Now we are scrolling (number of visible items in viewport) - 1 for each page down(up) (the '-1' is for keeping the context, so the last item will turn into the first in case of a page down, for example). Task-number: QTBUG-5877 Reviewed-by: thierry
| * | | | | QListView: cleaning up whitespacesLeonardo Sobral Cunha2009-11-181-7/+7
| | | | | |
| * | | | | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-182-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
| * | | | | Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-181-3/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution flow would allow the widget the scene would be rendered on to be null. However this very widget was being used when using DeviceCoordinateCache to get the desktop size. We now skip this optimisation when no widget is given. Auto-test included. Reviewed-by: bnilsen Task-number: QTBUG-5904
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-182-4/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | * | | | QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-172-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-1713-40/+73
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Yoann Lopes2009-11-179-39/+59
| |\ \ \ \ \ \
| | * | | | | | Warning FixesOlivier Goffart2009-11-171-4/+0
| | | | | | | |
| | * | | | | | Mouse wheel wouldn't scroll the itemview when over header viewsGabriel de Dietrich2009-11-171-1/+6
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse wheel event was not being relayed to the parent (supposedly QAbstractScrollArea) widget. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-5237
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-172-25/+43
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | * | | | | LineEdit graphics are sometimes missing from webpages with s60styleSami Merilä2009-11-172-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the webpage does define BODY colors for background, it is possible that lineEdits are not drawn at all. Actually, they are drawn but with transparent background, which makes them near-invisible. This is due to that QS60Style tries to check if the themePalette has been changed and if it has forwards the drawing of that particular widget to common style. Common style unfortunately uses active style's palette to draw the widget. S60Style defines Base to be transparent (to get the theme background shine through) and common style tries to use Base to draw lineEdit. End result is transparent lineEdit on webpage. This fix makes more educated deduction when it tries to see if style has been changed. This is related to QTBUG-4885. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen