summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2528-134/+481
|\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-246-3/+259
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stabilize QGraphicsEffect test on X11 Add a children private property needed for QML to support QGraphicsObject Invalidate the cache of QGraphicsEffect if a child becomes visible. Fix a crash when reparenting an item in QGraphicsView.
| | * Add a children private property needed for QML to support QGraphicsObjectAlexis Menard2010-03-246-0/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit adds a private property that QML can use to add children for a given item. This is a custom list that calls a callback which actually reparent the item instead of just appending in the list (otherwise it will mess up the state of QGraphicsView). This is needed because childItems() is pretty useless you get a list but if you append something on it then it adds that into a copy. Also the children property is the default property a concept used by QML. Width and Height private properties has been added in order to support better the integration with QGraphicsWidget in QML. The actual implementation is in the private class of QGI and QGraphicsWidget reimplements it to return the geometry. (In 4.7 QDeclarativeItem reimplements it too). This change should be harmless everything is private. Task-number:QT-2757 Reviewed-by:andreas
| | * Invalidate the cache of QGraphicsEffect if a child becomes visible.Alexis Menard2010-03-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The effect might rely on a child to draw itself. So we need to redraw if a child become visible or invisible. Task-number:QTBUG-7843 Reviewed-by:janarve
| | * Fix a crash when reparenting an item in QGraphicsView.Alexis Menard2010-03-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before calling addItem we need to invalidate the depth otherwise if someone call anything relating to sorting when itemChange is called (because of the scene change for instance) then qt_closestItemFirst for example can crash because of an invalid state. Task-number:QTBUG-6932 Reviewed-by:janarve
| * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg statements were generated in invalid order if user used pkg_prerules to redefine languages supported by the pkg file. Also made it possible to override dependency statements autogenerated for Qt and QtWebkit, as these statements need to be user defined in case of multiple languages. Defining the following in .pro removes all dependencies from pkg rules: default_deployment.pkg_prerules -= \ pkg_depends_webkit \ pkg_depends_qt \ pkg_platform_dependencies Task-number: QTBUG-9279 Reviewed-by: Janne Anttila
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2413-89/+133
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Compile fix Changed Symbian pkg files to deploy from under epoc32 Remove internal custom pixel metric enums Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01 Fixed S60 softkey implementation to use popup/modal dialog softkeys. Fixed 'fullsreen with softkeys' mode not to expand under softkey area. Fixed left softkey regression caused by 7829fe15 in Symbian. QS60Style: Housekeeping Custom pixel metric values cannot be inquired from outside the class Adding custom pixel metrics requires cleaning and rebuilding of QtGui
| | * Compile fixAlessandro Portale2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | Commit 47902b7587d66c0941bacf08b31b8caae264f09a was missing one enum rename in qs60style_s60.cpp Reviewed-by: TrustMe
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-2317-89/+171
| | |\
| | | * Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01Janne Anttila2010-03-231-3/+3
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * Fixed S60 softkey implementation to use popup/modal dialog softkeys.Janne Anttila2010-03-235-16/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously softkey implementation assumed that source for softkey actions is focused widget or activewindow if there is no focused widget. Since for example pop-up menu does not take focus immediately in touch enabled devices, the underlying widget softkeys were visible and usable when menu was open. This lead to problem that underlying widget could be interacted via softkeys when popup menu was open. For example as reported in QTBUG-8688, it was possible to close the underlying filedialog from which the currently active context menu was launched. It was also possible to open "Options" menu of underlying widget when context menu was open, leading to situation where several context menus could be launched via "Actions" item of "Options" menu. This was reported as an issue: QTBUG-6167 In addition when user started navigating in context menu via keypad, the menu got focus and softkeys changed to partially correct. Only partially correct, since context menu "Select" action and "Options" action had same priority and both associated to LSK. In addition the context menu action "Cancel" associated to RSK was set to invisible, meaning that it was also disabled and appeared in sofkeys as dimmed. All of these issues were fixed by making making the popup and modal dialogs highest priority softkey source. In case the focused widget is inside popup or modal dialog it is being used as an initial softkey source. In addition the softkeys created with QSoftKeyManager::createAction or QSoftKeyManager::createKeyedAction are now by default invisible i.e. not visible in context menu and have special property set to make them still normally enabled in softkeys. Task-number: QTBUG-6167 Task-number: QTBUG-8688 Task-number: QTBUG-9144 Reviewed-by: Sami Merila
| | | * Fixed 'fullsreen with softkeys' mode not to expand under softkey area.Janne Anttila2010-03-233-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | availableGeometry returns incorrect area after cba is made invisible, it seems that this happens because CAknToolbar is not made invisible. Fixed the problem by reverting back to SetExtentToWholeScreen usage when the widget is really fullscreen, i.e. Qt::WindowSoftkeysVisibleHint is not set. Task-number: QTBUG-9038 Reviewed-by: Miikka Heikkinen
| | | * Fixed left softkey regression caused by 7829fe15 in Symbian.Janne Anttila2010-03-231-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dialogs are always responsible for setting all of their softkeys by themselves, that's why this qmenubar hack can be removed. When "Options" menu support was moved from QMainWindow to QMenuBar, it appeared that some dialogs did had "Options" in LSK even it should have had dialog specific softkey. This commit removes the year old hack made to qdialogs softkey implementation. Reviewed-By: Sami Merila
| | * | Remove internal custom pixel metric enumsSami Merila2010-03-232-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use only public custom pixel metrics. Remove the internal enum and switch usage of those to public enum values. Task-number: QTBUG-9247 Reviewed-by: Alessandro Portale
| | * | QS60Style: HousekeepingSami Merila2010-03-223-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary #include, remove unnecessary integer, correct spelling issues in comments and replace tabs with spaces. Reviewed-by: Alessandro Portale
| | * | Custom pixel metric values cannot be inquired from outside the classSami Merila2010-03-223-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that a) custom values are internal and not exposed b) values use different format - they are indexes for internal data[] table and not according to QStyle documentation for pixel metrics. Task-number: QTBUG-9247 Reviewed-by: Alessandro Portale
| | * | Adding custom pixel metrics requires cleaning and rebuilding of QtGuiSami Merila2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that the size of the pixel metrics table is stored in some object file and the file is not updated, even if we increase the table size integer. Removing direct calls from internal methods to member variable data[] removes the need to do whole rebuild when adding values. Relates to task #9247. Task-number: QTBUG-9247 Reviewed-by: Alessandro Portale
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-241-7/+8
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc update for QSpinBox::textFromValue
| | * | Doc update for QSpinBox::textFromValueAnders Bakken2010-03-241-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | We remove the group separator so the docs should reflect this. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | Increase KeypadNavigation focus visibilityAlessandro Portale2010-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The focus frame was drawn with a low opacity. That was intended meant to increase aesthetics but in reality decreased usability. Now, the opacity is higher. But still with a difference between navigation mode and edit mode. Task-number: QT-826 Reviewed-by: Sami Merila
| * | | Fixing keypad navigation focus frameAlessandro Portale2010-03-221-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QFocusFrame drawing code in QS60Style incorrectly assumed that PM_LayoutSpacing is always equal to PM_FocusFrameMargin. When these values diverged, the focus frame broke as described in task QTBUG-8036. The fix makes the drawing more robust. The focus frame width is never thicker than PM_LayoutSpacing and PM_FocusFrameMargin. And instead of drawing a roundRect with calculated pen width, we are now filling a roundRect. That makes the focusFrame more apparent. Task-number: QTBUG-8036 Reviewed-by: Sami Merila
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-221-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix #ifdef logic for Symbian conversion functions in QVGPixmapData. Fixed table formatting in QSound documentation
| | * | Fixed table formatting in QSound documentationMiikka Heikkinen2010-03-221-1/+2
| | |/ | | | | | | | | | | | | | | | Added the missing \row tag Reviewed-by: TrustMe
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-226-11/+60
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Recommit 1ebeb971d3382aec0fff927 Fixed inconsistent test naming.
| | * Recommit 1ebeb971d3382aec0fff927Eskil Abrahamsen Blomfeldt2010-03-226-11/+60
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 725c2c29c192349016b1332824a7716bbb992f31 which reverted the original commit because of a test failure on qws. This recommit adds a test for whether the metrics from QFontEngine::boundingBox() are valid, which is required for the bearings to be calculated. This test was also in the original logic.
* | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-245-15/+15
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| * | | Inverted sorting arrows on QHeaderViews is intentional on GNOMEGabriel de Dietrich2010-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It follows the GNOME HIG as specified in http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e. Reviewed-by: jbache Task-number: QTBUG-9299
| * | | Revert "Sort indicators displayed incorrectly in GTK style"Gabriel de Dietrich2010-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe. The sorting order is intentional.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-235-17/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warnings in the declarative module compile fix for mingw (also removes some warnings) Sort indicators displayed incorrectly in GTK style
| | * | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-234-15/+13
| | | | |
| | * | | Sort indicators displayed incorrectly in GTK styleGabriel de Dietrich2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry Task-number: QTBUG-9299
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-237-11/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed usage of xplatform in configure. Fixed mif generation on symbian-abld. Fixed regular expression matching. More fool proof way for finding these headers Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds Disable OpenVG for symbian-sbsv2 on Linux. Corrected wrong header casing. Moved -s60 and -usedeffiles options docs to Symbian section. Added rpp and rsg files to ignore filter. Forced little endianness when using symbian-sbsv2 mkspec. Fixed incorrect platform string when building for Symbian. Added -qt-style-s60 to Symbian configure options on Linux.
| | * | | Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-231-1/+1
| | |\ \ \
| | | * | | Corrected wrong header casing.axis2010-03-151-1/+1
| | | | | |
| * | | | | Wrong repaint when changing the default row height in QTreeViewGabriel de Dietrich2010-03-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in QTreeView::dataChanged(), we didn't check for the actual change in the value before setting QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is true, we completely miss any resizing of the items. Reviewed-by: Thierry Task-number: QTBUG-9216
| * | | | | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to QTextLine which returns the accumulated advance of the glyphs in the text. Previously QTextLine::naturalTextWidth() was used for both this purpose and for calculating the pixel width of the text. Since these two metrics are not the same, either of the two usages would be wrong. QTextLine::naturalTextWidth() has been changed to do what its documentation claims it does, and horizontalAdvance() should now be used for laying out text horizontally. Reviewed-by: Simon Hausmann
| * | | | | Fix QGraphicsEffect cache when the item is not visible by the view.Alexis Menard2010-03-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't rely on the exposed rect since the item can be outside the view so we need to regenerate the complete pixmap. Task-number:QTBUG-8750 Reviewed-by:sroedal
| * | | | | Calling setX and setY should send itemSendGeometry/ScenePositionChanged eventsAlexis Menard2010-03-231-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetX and setY were calling setPosHelper directly therefore events for itemSendGeometryChange and itemSendScenePositionChange were not sent properly. Task-number:QTBUG-9093 Reviewed-by:janarve
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Use canonical form for headers Remove exporting of QDeclarativeContext class symbols Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. ...
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-0/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| | * | | | Set role names for QFileSystemModel and QDirModelMartin Jones2010-03-222-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7479 Reviewed-by: Alexis Menard
* | | | | | Fix a problem with the selection losing items when layout is changedThierry Bastian2010-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2804 Reviewed-by: ogoffart
* | | | | | refactor connections/disconnections in QItemSelectionModelThierry Bastian2010-03-222-60/+26
| | | | | | | | | | | | | | | | | | | | | | | | Ther was duplicated code and useless disconnections in the destructor
* | | | | | small little change to the initialization of item viewsThierry Bastian2010-03-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to calldoDelayedItemLayout, setting the flag that the widget needs the item layout is enough
* | | | | | disable copy of QPainterPathStroker as its not copiable.Gunnar Sletta2010-03-221-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of QScopedPointer already broke source compat for this one, not compiling is better than crashing at runtime. Reviewed-by: Trond
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-222-10/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed performance issues when falling back to raster for sub-pixmaps. Dragging headers in item views done right
| * | | | | Fixed performance issues when falling back to raster for sub-pixmaps.Samuel Rødal2010-03-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the sub-pixmap so that we don't need to convert the entire pixmap to a QImage each time. Reviewed-by: Gunnar Sletta
| * | | | | Dragging headers in item views done rightGabriel de Dietrich2010-03-221-8/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the dropped position depended on the position of the middle of the dragged header w.r.t. the hovered header. Now, it only depends on the mouse cursor position and the middle of the hovered header, closer to what happens on Windows or Mac OS. Reviewed-by: Thierry Task-number: QTBUG-6968
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-2213-98/+160
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.