summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-1727-209/+589
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal font database was only populated with .ttf and .ccc files. This patch adds .ltt as file type. Without complete font type coverage in the fontstore, we may get a mismatch in the internal association of font table and fontfamily. Most probably, this will also fix the crash on SSE Satio's. SSE seems to use .ltt files already on S60 5.0. An improvement needs to be verified by an owner of such a device, however. Task-number: QTBUG-8905 Reviewed-by: Aleksandar Sasha Babic
| * QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelikeSami Merila2010-05-142-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick, which leads to itemview item activation only occur on double-click (or tap). The item selection work native-like on Sym^3. As a correction, style needs to check the passed styleoption and check whether or not the state "Selected" is on. In these cases, the itemactivation can proceed. Task-number: QTBUG-10697 Reviewed-by: Miikka Heikkinen
| * Fix spurious mouse click when dismissing a native menuShane Kearns2010-05-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Native menus are dismissed by the key press event. The Qt application then receives the key up event, as it now has keyboard focus. The virtual mouse implementation now filters out select key press/release which don't match the expected mouse button state. Task-number: QTBUG-9860 Reviewed-by: Alessandro Portale
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-121-0/+3
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QFont to respect the italics constructor flag.
| | * Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a QFont with the constructor that takes the italic bool flag didn't work properly, since the property wasn't set to be resolved. It may be that the property should *always* be resolved, but to minimize impact, it's only done now if you pass in 'true' for italics. Reviewed-by: Eskil
| * | Don't crash when applications set Qt::WA_TranslucentBackground.Jason Barron2010-05-121-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | After replacing some code with a function call to s60UpdateIsOpaque() we introduced a crash for widgets that set Qt::WA_TranslucentBackground. The reason for the crash was that the Qt::WA_WState_Created attribute was being set before calling this function, but *not* before setWinId() was being called. This meant that s60UpdateIsOpaque() assumed that the window was created (and the handle added to the widget map), but this was not actually the case. The fix here is to move the call to s60UpdateIsOpaque() after the call to setWinId() such that those assumptions are true. Reviewed-by: Jani Hautakangas
| * Fixed a potential crash with misconfigured CUPS printers.Trond Kjernåsen2010-05-111-1/+1
| | | | | | | | | | Task-number: QTBUG-10512 Reviewed-by: Kim
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-101-4/+5
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix for torn off menus that were way too big Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-101-4/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix for torn off menus that were way too big Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
| | | * Fix for torn off menus that were way too bigThierry Bastian2010-05-101-4/+5
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-101-6/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Improved mapping of locales on symbian. An improvement to the previous commit.
| | * | | An improvement to the previous commit.Denis Dzyubenko2010-05-101-6/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This fixes 005dc6c7448a724d3df496a1e528199f5a638ce0 that was pushed by mistake. Task-number: QT-3349 Reviewed-by: trustme
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-101-2/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style will draw focus frame to a PushButton with any stylesheeting
| | * | QS60Style will draw focus frame to a PushButton with any stylesheetingSami Merila2010-05-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to incorrect braces in the if-within-if, QS60Style decided to use QCommonStyle for styling focus frame into QPushButton when button had *any* kind of stylesheet. Corrected the braces. Task-number: QTBUG-10549 Reviewed-by: Alessandro Portale
| * | | Fixes a crash in gestures.Denis Dzyubenko2010-05-101-1/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | This is a partial backport of a fix that was pushed to 4.7 (734ba1f540aaedc4a3558268bd7350c0b15325a4) Task-number: QT-3349 Reviewed-by: trustme
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-073-55/+60
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Modified audiodevices example to list all supported formats QS60Style: QTreeView branch indicators are drawn incorrectly in RtoL QS60Style: Housekeeping task QS60Style - PushButton with text and with icon should be of same size QS60Style: When context menu is open ToolButton is not pressed down Adding some error checking for setdefaultif Making network reconnect happen after teardown.
| | * QS60Style: QTreeView branch indicators are drawn incorrectly in RtoLSami Merila2010-05-073-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style tries to rotate branch graphics around the x-axis, when it is running in RtoL UI direction. This makes the "L-shaped" branch indicators to point to too high at the item view item. Branch indicators should be mirrored across the x-axis to make them look fine. Task-number: QTBUG-9844 Reviewed-by: Alessandro Portale
| | * QS60Style: Housekeeping taskSami Merila2010-05-072-15/+10
| | | | | | | | | | | | | | | | | | | | | Fix whitespace, remove unneeded code, break very long lines to two rows. Reviewed-by: Alessandro Portale
| | * QS60Style - PushButton with text and with icon should be of same sizeSami Merila2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pushbutton contains standardIcon or non-modified text, it should be of same size. As a fix, style now checking default text height for icon pushbuttons and if the icon is smaller than text height, style will make button to match text height content. Task-number: QT-2179 Reviewed-by: Alessandro Portale
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-05-071-0/+9
| | |\
| | * | QS60Style: When context menu is open ToolButton is not pressed downSami Merila2010-05-071-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style prefers to use widget and calls its down() API. The value is not true unless tool button has been set down programmatically. Thus, we should rely on State_Sunken as well. As a fix, style asks from both the widget and checks the state before drawing button raised/pressed. Task-number: QTBUG-10487 Reviewed-by: Alessandro Portale
| * | | QSystemTrayIcon: put WinCE specific code into qsystemtrayicon_wince.cppJoerg Bornemann2010-05-073-54/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The desktop Windows and Windows CE code paths diverged too much. Splitting it up now and making it work on WinCE again. Task-number: QTBUG-4828 Reviewed-by: mauricek
| * | | Windows CE: fix multiple QAction::triggered() signalsJoerg Bornemann2010-05-075-17/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Adding the same menu action object to n menu bars resulted in n QAction::triggered() signals. Now, we're comparing the active window with the parent HWND of the menu bar before triggering. Task-number: QTBUG-10402 Reviewed-by: thartman
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-071-0/+9
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed line and point drawing for the PS/PDF generators.
| | * Fixed line and point drawing for the PS/PDF generators.Trond Kjernåsen2010-05-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some lines and points could appear with artifacts when printed or viewed in a pdf viewer. If a brush was set we also generated a fill for the line/point, which was not correct. Task-number: QTBUG-8451 Reviewed-by: Gunnar
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-072-13/+21
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: Sliders are too small QLineEdit / QDateEdit - white font on white background Corrected headers for spectrum analyzer demo QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| | * QS60Style: Sliders are too smallSami Merila2010-05-061-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometime back slider graphic in the QS60Style was changed to use the "new" slider graphic available in 5th Edition and newer SDKs (the old SDKs still use the slider graphic). However, at that time nobody noticed that the new slider has different size than the old one in the Nokia LAF document. To fix the sliders, updated the pixel metrics calculation rules to use the new slider LAF data. Also fixed a grpahic start and end part rounding to match native look. Task-number: QTBUG-10454 Reviewed-by: Alessandro Portale
| | * QLineEdit / QDateEdit - white font on white backgroundSami Merila2010-05-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QCoeFepInputContext uses default QLineEdit palette when setting up text format before passing the formatted text to native side (which uses it, for example, to show T9 suggested words). The above way is incorrect due to two reasons: - custom widget might not be anything like QLineEdit and might have really different palette from it - it ignores stylesheets (or modifications to the QLineEdit's palette) Therefore, the color for text format is picked up from focusWidget, if it is available (in most cases it should be). If the focusWidget is not available, then QLineEdit default palette is used. Task-number: QTBUG-9480 Reviewed-by: Janne Koskinen
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-061-0/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-051-0/+8
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QCalendarWidget draws only one-digit dates Add spectrum analyzer demo app
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-05-051-1/+4
| | | | |\
| | | | * | QS60Style: QCalendarWidget draws only one-digit datesSami Merila2010-05-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to largish pixel metrics values for text margins, content does not fit into QCalendarWidget date-cells. To fix this, the failing pixel metric values are halved for QTableViews and its derivatives. This matches native margins almost perfectly (depending on native layout 1-2 pixel offset). Task-number: QTBUG-10417 Reviewed-by: Alessandro Portale
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-05-064-7/+17
| |\ \ \ \ \
| | * | | | | QGraphicsWidget was not working properly when ItemSendsPositionChanges is falseAlexis Menard2010-05-054-7/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The geometry was not properly set because QGraphicsWidget rely on itemChange to update its own geometry. Now when calling setPos we also ensure that for a widget the geometry will be up to date. Setting the flag ItemSendsPositionChanges to false for a given widget will give a small performance boost. Reviewed-by:janarve Reviewed-by:bnilsen
| * | | | | Recalculate script item widths when forcing justificationEskil Abrahamsen Blomfeldt2010-05-061-2/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When going through the special WebKit code path for text drawing and forcing justification for text, we would set the justification in the text engine, but never actually update the widths of the script items. Since the width of the script item is used to position the text, the text would be drawn with the correct justification, but the position would be set based on the non-justified text width. The result was overlapping text whenever the script of the text changed. The fix goes through the justified glyphs and sets the width and position based on the new effective advance. Task-number: QTBUG-10421 Reviewed-by: Simon Hausmann
| * | | | WindowsMobileStyle: fix QTreeView indicator sizeJoerg Bornemann2010-05-051-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7364 Reviewed-by: thartman
| * | | | document that QMenuBar::setDefaultAction is only available on Win MobileJoerg Bornemann2010-05-051-1/+1
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-8393
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-051-52/+82
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: WinCE: QMenuBar::triggered(QAction*) was emitted too often coding style changes in qmenu_wince.cpp
| | * | WinCE: QMenuBar::triggered(QAction*) was emitted too oftenJoerg Bornemann2010-05-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QMenuPrivate::activateAction instead of QAction::activate makes use of the internal recursion guard and fixes this problem. Also emitting QMenuBar::triggered in the command-in-menu-bar case will QAction::activate do for us. Task-number: QTBUG-10358 Reviewed-by: thartman
| | * | coding style changes in qmenu_wince.cppJoerg Bornemann2010-05-051-48/+79
| | |/
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-041-1/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix combobox backgroundrole not respected in some styles Allow QtDBus to be compiled as a static library on Windows.
| | * Fix combobox backgroundrole not respected in some stylesJens Bache-Wiig2010-05-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was a regression in 4.5 since we introduced styling. We now set the background role as the menuoption palette when available. Reviewed-by: ogoffart Task-number: QTBUG-10403
* | | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
| | |
* | | Revert "Optimized pixmapcache key generation for icons and styles"Thiago Macieira2010-05-153-48/+65
| | | | | | | | | | | | This reverts commit b8f1d7fd87985375a373ca85052c475241822b03.
* | | Revert "More improvements to pixmap cache key generation"Thiago Macieira2010-05-144-57/+50
| | | | | | | | | | | | This reverts commit c8d2e18c4b431870560f324a17f20904bb47ae68.
* | | More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | HexString is actually more optimal than fromRawData since we dont need any allocations while using it. Arguably the code is also a bit nicer. Task-number: QTBUG-9850 Reviewed-by: ogoffart
* | | Fix for autotest failure in qwidget::saveRestoreGeometry()Carlos Manuel Duclos Vergara2010-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the fix for bug QTBUG-10519 introduced a new state for saving the geometry. However there is an exception and that exception comes into play when saving a maximized window. This fixes that by making sure we only enter into that state when the window is not currently maximized. Reviewed-by: tbastian
* | | Optimized pixmapcache key generation for icons and stylesJens Bache-Wiig2010-05-143-65/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we sacrifice the readability we can make cache keys much faster. Since there is rarely a usecase where we need these as human readable strings we can take advantage of this fact and remove almost all memory allocations while still keeping them unique. Task-number: QTBUG-9850 Reviewed-by: brad
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-144-3/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Mac: restoreGeometry() [Regression] Build failure on Mac Carbon doc: Added some \briefs to how-to docs. Some 4.7 changes. Updated changelog. Cherry pick fix for MOBILITY-932 from Qt Mobility. Cherry pick fix for MOBILITY-962 from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Bearer management changes from Qt Mobility. Cherry pick fix for MOBILITY-828 from Qt Mobility. Added snippet labels to QML Dial example. Fixed documentation typo.
generated by cgit v0.12 at 2024-12-06 04:42:42 (GMT)