summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-241-2/+7
| | | | | | | | | | | This is a regression fron 4.6 release. Menu entries with some specific roles are automatically merged to the application menu. They are now translated based on the context "MAC_APPLICATION_MENU" instead of "QMenuBar" context. This patch eanbles the use for both contexts. Task-number: QTBUG-13878 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
* Fix a crash with D&d on mingwThierry Bastian2010-09-241-6/+6
| | | | | | | | | The Drag&Drop callbacks need to be correctly aligned to not crash in the graphics SSE code. Task-number: QTBUG-13787 Reviewed-by: benjamin poulain (cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)
* QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-241-0/+4
| | | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
* Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
| | | | | | | | | QTextControl should no longer inherit the layout direction of parent widget as its default text direction. Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Lars Knoll (cherry picked from commit 6397e5bc49f11e20a9d1838d8d8df46dd9486263)
* Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll (cherry picked from commit 9b20aac0ad83b917c46cc44b78dc90fb1d238fe8)
* Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-232-8/+18
| | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil (cherry picked from commit eb2926a2f9607e985b8bca54346e6fdf91343247)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-232-0/+8
| | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* Avoid creating copy of an image in memory when storing as jpegaavit2010-09-221-28/+13
| | | | | | Task-number: QT-3871 Reviewed-by: Kim (cherry picked from commit 7efe816d028876487a6a44d97ed58a807da7d4d8)
* Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-211-11/+8
| | | | | | Task-number: QTBUG-13653 Reviewed-by: aavit (cherry picked from commit 5220c371176951e12d525ac7908861d111c367d0)
* Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-211-4/+4
| | | | | | Task-number: QTBUG-13437 Reviewed-by: Janne Koskinen (cherry picked from commit 0cbb1a488c4199ad06b8ab63a9d6bf09fc8a6911)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-173-30/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export qt_directfb_.* functions in plugin as well Added autotest for QPixmap::size() with null pixmaps. Update Symbian def files. QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-173-30/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-163-30/+32
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| | | * QGraphicsItem::childrenBoundingRect behavior breaks ↵Bjørn Erik Nilsen2010-09-162-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect::sourceBoundingRect(). Context: QGraphicsEffect::sourceBoundingRect() returns: item->boundingRect() | item->childrenBoundingRect(); Problem was that item->childrenBoundingRect() adjusted the children's bounding rect with the children's ancestor effects (child -> root item), which means the source bounding rect was bigger than needed. We should only account for effects downwards in the hierarchy. root (has effect) | item (has effect) | child | grandChild Auto test included. Task-number: QT-3633, QT-3828 Reviewed-by: samuel
| | | * Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-162-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression after: f5c5e20a Problem was that the cached bounding rect was never invalidated. We can also remove the cached bounding rect in QGraphicsEffectSource because QGraphicsItem::childrenBoundingRect now clips by default. This basically means partially reverting above commit and invalidate whenever ItemClipsChildrenToShape flag changes. Auto test included. Task-number: Discovered while investigating QT-3633 Reviewed-by: samuel
| | | * Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Extern missing symbol Reviewed-by: Fabien Freling
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-172-13/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement QAudioInput::suspend() using CMMFDevSound::Stop() Discard buffer pointer when DevSound is stopped Suppress overflow errors raised by Symbian DevSound during playback Discard empty buffer on call to QAudioOutput::resume() Permit QAudioOutput::processedUSecs() to be called immediately after start() Discard all DevSound buffers held when QAudioInput::suspend() called Fixed buffer overrun in Symbian QAudioInput backend QS60Style does not show checkbox for checkable item in QTreeView Load environment.prf from Symbian SDK if it exists there Remove pre-Symbian3 plugins from Symbian3 and later builds Panic in qs60style.cpp while drawing a QTreeView
| * | | | QS60Style does not show checkbox for checkable item in QTreeViewSami Merila2010-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style currently skips drawing of checkbox for checkable itemviews. It however reserves space for the checkbox in the itemview item row. As a fix, also draw the checkbox. Task-number: QTBUG-11150 Reviewed-by: Shane Kearns
| * | | | Panic in qs60style.cpp while drawing a QTreeViewSami Merila2010-09-172-11/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style crashes when running a test application that modifies active style AND application's palette. After switching to other style, setting palette to application default, re-enabling the style's palette and activating QS60Style, causes a crash. This is due to that internal theme palette is tried to access, before it is constructed. Fixed by making sure that when theme palette is accessed, it is not NULL. Task-number: QTBUG-13553 Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1712-20/+40
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) Doc: css fine tuning Doc: Fixed a non-compiling example. Doc: removing linebreak Doc: correcting html template Doc: Updated What's new in 4.7 page Doc: Updated What's new in 4.7 page Doc: Removing google analytics from offline docs Doc: fixing creator bug in page footer Doc: correcting html template - validating Doc: fixing issues with table indent - css Doc: Fixing style: line height, ol indent, coulmns (css3) Doc: correcting html template Doc: Updated the Mac requirements page. Doc: Cleaning up the known issues page. Pointing people to check the online resources. Added a QFormLayout snippet to the layout.qdoc and layouts.cpp Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7. Doc: Listed undoable operations in QTextDocument Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: Note on updating proxy models with dynamic sort filters qdoc: Fixed an html formatting error in the QML property list. ...
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-166-31/+53
| |\ \ \ | | |/ /
| * | | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| | | | | | | | | | | | | | | | | | | | Task-number: QT-1212 Reviewed-by: David Boddie
| * | | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QT-689 Reviewed-by: David Boddie
| * | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1524-140/+263
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-138-80/+18
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-112-2/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-107-7/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0922-150/+270
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-074-10/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0716-311/+333
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0326-234/+517
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-0211-20/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Clarified iterator semantic in documentation and added a code snippet to a ↵Jerome Pasion2010-08-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML signal handler. Reviewed by: David Boddie Tasks:QTBUG-13243, QTBUG-11779
| | * | | | | | | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-3010-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | | | | | | | | | | Fixed compilation of qdrawhelper.cpp with XLC 10Rohan McGovern2010-09-161-1/+1
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With XLC 10, calls to static functions within a template function need to be fully qualified. Reviewed-by: Marius Storm-Olsen
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-161-17/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-162-1/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QS60Style shows tick mark for listWidget with multiselection capability only after two or more items are selected. This is fixed so that selection indication is shown in multiselection itemviews (all of them and not just list widget) irregardless of number of selected items. Also, if itemview loses focus with singleitem itemview, style now still draws item highlight to it (with 50% transparency). Task-number: QTBUG-12875, QTBUG-13072 Reviewed-by: Janne Anttila
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-163-13/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| * | | | | | | | | | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After change 79eef278228aac21fbf QPixmap::size() started returning QSize(-1, -1) for null pixmaps. This restores the old behavior of returning QSize(0, 0), and is symmetric with QImage::size(). Task-number: QT-3934 Reviewed-by: Trond
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-1557-382/+608
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make sure mapSelectionFromSource does not return a selection with invalid ↵Stephen Kelly2010-09-151-4/+12
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ranges. Similar for mapSelectionToSource, but that one could possibly be an assert instead. Merge-request: 2474 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | | | | | | | | | Doc: Continued work on the QML documentation.David Boddie2010-09-141-8/+7
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-142-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| * | | | | | | | | | Completing the interface for children/data/resourcesThomas Hartmann2010-09-142-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the handling of properties like children and data easier in Bauhaus. Especially in the case of property alias Reviewed-by: Aaron Kennedy
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QTBUG-13501 - crash when a gesture is accepted but not consumed Add test: assert when gesture is never accepted.
| * | | | | | | | | | | fix QTBUG-13501 - crash when a gesture is accepted but not consumedJeremy Katz2010-09-141-2/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-142-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsWidget update issues with ItemHasNoContents + effect Fixed missing background for regular Qt applications with MeeGo system. Fix top-left corner of rounded rects in QPaintEngineEx
| * | | | | | | | | | | QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items with the ItemHasNoContents flag set are never drawn so the 'paintedViewBoundingRect' is never cached/updated resulting in updates wrongly being discarded. The solution is to always invalidate the children for such items. Auto test included. Task-number: QT-3803
generated by cgit v0.12 at 2025-03-20 17:30:12 (GMT)