summaryrefslogtreecommitdiffstats
path: root/src/plugins/styles
Commit message (Collapse)AuthorAgeFilesLines
* Windows 11 style: simplify code to polish paletteVolker Hilsheimer6 days2-60/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two cases in which we let the style polish a palette: - after merging the system palette and the style's standard palette - or when a widget-class specific palette gets set A style needs to know which colors of the palette it can safely overwrite with style-specific preferences. For that to work, we need to reset the resolve mask of the synthesized palette (first case) to 0 before polishing. Palettes set explicitly by application code will then have resolve bits set, and the polishing can respect those colors and not overwrite them. Simplify the polish() implementation then to check whether the respective color's resolve bit is set, and only overwrite it with the style's preferred color if the bit is clear. Move that logic into a macro for simplification. This amends b733d31f275d09ca81b5e347ca1e9b6c9b216cd4 and makes sure that colors that are set by the application explicitly don't get overridden by the style. Task-number: QTBUG-124490 Task-number: QTBUG-124286 Change-Id: I69e1e3da93f661ebdafee0b62adbb3d411322443 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Remove QGuiApplicationPrivate::colorScheme()Volker Hilsheimer7 days2-3/+4
| | | | | | | | Use the platform theme or QStyleHints instead. Task-number: QTBUG-124490 Change-Id: Iab12faa726d3031d6a250664468dac333c2c2e0c Reviewed-by: Doris Verria <doris.verria@qt.io>
* QWindows11Style: Respect user set StylesheetsWladimir Leuschner9 days2-12/+42
| | | | | | | | | | | | | | | | QWindows11Style inherits from QWindowsVistaStyle for which StyleSheet theming is deactivated. QWindows11Style draws most elements with QPainter and should therefore be able to use overrides by StyleSheets. This patch checks, whether QWindows11Style is used and enables the theming by declaring it not to be a QPixmap based style. Further drawing routines for QComboBox, QPushButton and QLineEdit are now drawing always the base background and when they are hovered a alpha mask is used to overdraw the elemens to create a highlight effect. Fixes: QTBUG-124286 Pick-to: 6.7 6.7.1 Change-Id: I65436493bc2b1572c0d9423a066caea3ba9e1459 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix progress bar rendering issue when using windows 11 styleSanthosh Kumar10 days1-60/+57
| | | | | | | | | | | | | The Windows 11 style checks for QProgressBar type and gets the respective orientation required for rendering. This creates an issue when we use QStyleItemDelegate as it's not QProgressBar type. This patch removes that condition and gets the orientation information through the style option similar to Windows Vista style. Fixes: QTBUG-124447 Pick-to: 6.7 Change-Id: Ic2b36d79d7af017262e44dd2800ad45fbe63f8f2 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Windows11Style:Save unpolished palette for QAbstractScrollArea::viewportWladimir Leuschner14 days2-4/+15
| | | | | | | | | | | | | | | When using QWindows11Style, the viewports background has to be set to Qt::transparent to have the effect of rounded corners in ItemViews and Combobox flyouts. Other Windows styles do not make use of transparent windows, so this polishment needs to be reverted in case the style changes. Other styles also do not manipulate the QAbstractScrollArea::viewport palette and thus changing color schemes results in not applying the new color scheme. Fixes: QTBUG-123928 Pick-to: 6.7 6.7.1 Change-Id: Icb529124f63587e75bb56e40e8b1fcfe3c61c55d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Avoid crash with Windows 11 style when no widget passedMarius Kittler2024-04-221-2/+2
| | | | | | | | | | The documentation of `QStyle::drawControl()` states that "The widget argument is optional" so it must not be used unconditionally. Pick-to: 6.7 Change-Id: I8b5a8ed421c0ae2c667925e448c9a029b6deedfd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Replace expensive inherits with cheaper qobject_cast (2)Volker Hilsheimer2024-04-191-36/+44
| | | | | | | | | | | | | | | In the Windows 11 style, it's better to include the headers for specific widget types at the expense of compile time, than to pay a regular runtime cost from using expensive inherits(). Add const, fix style, and break excessively long lines related to this change. Pick-to: 6.7 Change-Id: I2c8c6d98267d9ff3542decda71e08e462cf9807c Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
* QStyle: deprecate PM_DialogButtons* enumsChristian Ehrlicher2024-04-171-19/+0
| | | | | | | | | | | | The threee enumerations - PM_DialogButtonsSeparator - PM_DialogButtonsButtonWidth - PM_DialogButtonsButtonHeight Are not documented since Qt3 times and also not used anywhere. Therefore deprecated them and remove the logic to handle them. Change-Id: Ia59fe15482e744123e7fbf04b8d44661afb58b5c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Mac style: draw dock widget titles and status bar without gradientVolker Hilsheimer2024-04-111-56/+2
| | | | | | | | | | | | | | | | | | | | | | Fill with the "window" color of the palette as passed in through the style option, which takes care of active vs inactive color selection. The title bar of a docked dockwidget is a bit lighter than the main window title and unified toolbar background, but identical to the color of the title of an undocked dock widget. This is now the case for both dark mode and light modes. Also remove the gradient fill from the status bar, just fill it with the window brush. Remove the now unused helper functions for the title bar gradient. Fixes: QTBUG-92855 Pick-to: 6.7 Change-Id: Ia04c630201b288c0107567d3f459f66129693c82 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Mac style: draw MDI window title bar without gradientVolker Hilsheimer2024-04-111-10/+1
| | | | | | | | | | | Use a solid fill with the "button" color of the palette also for active title bars, which is then the same color as the frame, and gives the window a consistent look in both dark and light mode. Fixes: QTBUG-123162 Pick-to: 6.7 Change-Id: Iac26fdb1518ffe4f8255e01bedf7329be40ac258 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QWindows11Style: Check for nullptr after qobject_castWladimir Leuschner2024-04-091-137/+140
| | | | | | | Fixes: QTBUG-123791 Pick-to: 6.7 Change-Id: I050196bdf45754509a223c89652e0be7e0160a98 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QWindowsVistaStyle:Revert polishing of QAbstractScrollArea/QGraphicsViewWladimir Leuschner2024-03-251-12/+0
| | | | | | | | | | Revert the polishing for QAbstractScrollArea and QGraphicsView introduced in a1f12273b2e355033ab2a9478d1e9702210a0733 Fixes: QTBUG-123722 Pick-to: 6.7 6.7.0 Change-Id: I9db9079c672f4bf70ce3401382a5843855df2c4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QWindows11Style: Add offset for decoration in QComboBoxPrivateContainerWladimir Leuschner2024-03-211-4/+10
| | | | | | | | Pick-to: 6.7.0 6.7 Change-Id: Ib9043e1b3041c88d757ddd5ada6c0edcf2bb6129 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QWindows11Style: HighDPI aware qDrawPlainRoundedRectWladimir Leuschner2024-03-151-6/+12
| | | | | | Pick-to: 6.7 Change-Id: Ic9562a20bce59c265c539a1378f5f8fd8e9e9a17 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QWindows11Style: HighDPI aware progressbarsWladimir Leuschner2024-03-121-10/+14
| | | | | | | | | Draw progressbars and progressbar handles on sub-pixel coordinates to be HighDPI aware. Pick-to: 6.7 Change-Id: Ib4f39c3b3a05d9f47c045dd6032d7544b7add175 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QWindows11Style: HighDPI aware scrollbarsWladimir Leuschner2024-03-121-7/+41
| | | | | | | | | Draw scrollbars and scrollbar handles on sub-pixel coordinates to be HighDPI aware. Pick-to: 6.7 Change-Id: Iab7c8566f31a58f83d03ec6644be68bf130682ce Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Don't show mnemonics in dockwidget titlesChristian Ehrlicher2024-03-092-4/+4
| | | | | | | | | | | | Dockwidget title accelerators doesn't work in dock widgets, so don't show them. This amends cc67b25579c1bb5ea9f5c1ca4c9b7997e66f19b9. Fixes: QTBUG-86407 Pick-to: 6.7 6.6 Change-Id: I83fb2da1304d1e2b5eedfc127e5db3d322756d06 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QWindows11Style: Draw ScrollArea opaque in QAbstractItemViewWladimir Leuschner2024-03-071-15/+4
| | | | | | Pick-to: 6.7 Change-Id: Ica2c62355a576dda4eaefacbc41b8609009d0073 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QWindows11Style: Update font size in menubar items and spacing between itemsWladimir Leuschner2024-03-071-3/+14
| | | | | | | | | | | Reduce the spacing between menu bar items and change font size to 10pt. Fixes: QTBUG-120639 Pick-to: 6.7 Change-Id: Ic16e74f4a2426be6d6ef40904919d92785d96ce5 Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QWindows11Style: Draw frames HighDPI awareWladimir Leuschner2024-03-051-50/+110
| | | | | | | | Draw frames and lines on sub-pixel coordinates to be HighDPI aware. Pick-to: 6.7 Change-Id: Ie4eed73b3e5780216fad0b6a919cbe18391f2b79 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Increase padding for LineEdit controls in QWindows11StyleWladimir Leuschner2024-03-012-5/+41
| | | | | | | Pick-to: 6.7 Change-Id: Ibf8e43160d7ae0aff04040f0e2bcf5bfbda52e1d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QWindows11Style: Fix transparency for overlapping ItemView editingWladimir Leuschner2024-03-011-1/+9
| | | | | | | Fixes: QTBUG-120254 Pick-to: 6.7 Change-Id: Iabaee612f5a0613cbbcafe566b4a14d01cefa47c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QWindows11Style: Revert Windows global palette changesWladimir Leuschner2024-02-291-1/+78
| | | | | | | | | | | Revert Windows global palette changes and set the QPalette for QWindows11Style in QWindows11Style::polish Fixes: QTBUG-120571 Pick-to: 6.7 Change-Id: Iad4eb699c2dbfed38a917e6c9bc378c4262dc66e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* QWindows11Style: Set mask for MDI Window only in case widget is validWladimir Leuschner2024-02-191-9/+11
| | | | | | | Fixes: QTBUG-122398 Pick-to: 6.7 Change-Id: I3f7e01548f4a243b2356cbc1e669384fce1d1261 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Modern windows style: fix implicit conversion errorMårten Nordheim2024-02-121-2/+2
| | | | | | | | | | | "implicit conversion from 'double' to 'int' changes value" Amends a1f12273b2e355033ab2a9478d1e9702210a0733 Pick-to: 6.7 Change-Id: I7b26073403c8a589b5ec1d6b32e06b4bb6283946 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
* Remove extra semi-colonsTasuku Suzuki2024-02-063-4/+4
| | | | | Change-Id: I92fddb36cd136fd1bd627955f15d0559b9942d7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* QWindows11Style: Draw MDI SubWindows in Windows 11 styleWladimir Leuschner2024-02-022-3/+295
| | | | | | | Fixes: QTBUG-120633 Pick-to: 6.7 Change-Id: I6ad4052ca45f7c90cd52a9d2440b508730d3685d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QWindows11Style: Disable Animations for inactive QRadioButtonWladimir Leuschner2024-01-251-6/+8
| | | | | | Fixes: QTBUG-120264 Change-Id: I18b55b8e26a132b8e6dca2c669c7cec8c5f82e69 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QWindows11Style: Fix QMessageBox drawing for light/dark modeWladimir Leuschner2024-01-161-0/+15
| | | | | | | Fixes: QTBUG-120748 Pick-to: 6.7 Change-Id: I4101848e2e91c489cb53b38ae6bf0171701c5c54 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix ItemView editing look and custom background color on QWindows11StyleWladimir Leuschner2024-01-091-17/+18
| | | | | | | | | | Disable text painting, when current item in ItemView is in editing mode. Respect custom set background colors for items in ItemView. Fixes: QTBUG-119501 Change-Id: I0cc80459e67765b2e648aa438aabc7dc18bef4a9 Reviewed-by: Chris René Lerner <chris.lerner@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix visible state of QRadioButton in Windows11 style with animations offWladimir Leuschner2023-11-171-0/+13
| | | | | | Change-Id: I870afeb3330fcbe49ce6f16e847af23c3d91b74b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windows: Improve hidpi style drawing and metricsMorten Sørvig2023-11-153-61/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up change from enabling DPI awareness, which caused some style elements (for instance check boxes) to be rendered incorrectly on non-primary displays, when there is a difference in DPI between displays. Use two approaches to get system metrics and themes: * Use forDpi() API variants and query at 96 DPI for style metrics, that are in device independent pixels. These are metrics which are used for layout calculations. * Get theme metrics at the target display DPI, and scale to device independent pixels when needed. This is used for OpenThemeData(), since this theme is used for drawing as well and needs to be in device pixels. One approach is not used any more: * Get metrics for the main display, and scale by the ratio between the main and target display. Change the theme cache to cache themes per window handle (HWND). This is required since OpenThemeData() returns theme data for a specific DPI, which means we can no longer use a shared cache. Clear the cache on theme change, DPI change, and when the window is destroyed. This handles cache invalidation when the window is moved to a different screen, and also when the DPI for a screen is changed. Move the cache implementation to QWindowsStyleSupport in QtGui, where it can be accessed by both the style and windows platform plugins. Task-number: QTBUG-110681 Change-Id: I5a4ff3a3753762bad8a51d08e51e8013bc7816a1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Introduce dark mode to QWindows11StyleWladimir Leuschner2023-11-033-66/+150
| | | | | | | | Introduce dark mode to QWindows11Style and increase frame contrast on highcontrast themes. Change-Id: I18d10a314fb11828b8c3a116396e2d3cd2247b65 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce TabWidget to Windows11 styleWladimir Leuschner2023-10-271-0/+26
| | | | | | | | Introduce a TabWidget with rounded corners. Change-Id: Ie6eb7a3e05b2240a0ecce2604ca87cc3db549dd1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Introduce Spinbox into QWindows11StyleWladimir Leuschner2023-10-272-0/+127
| | | | | | | | Introduce WinUI3 inline NumberBox styled QSpinBox. Task-number: QTBUG-113617 Change-Id: Id10776f4004e502d7855e0671e58d0f39639ff81 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce rounded plain frames, group boxes in QWindows11StyleWladimir Leuschner2023-10-271-0/+49
| | | | | | | | Plain frames and group boxes are now drawn with rounded edges. In QWindows11Style. Change-Id: I576873d31c2252b7a22d84e8e86c64e09e2e5023 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce progressbar in QWindows11StyleWladimir Leuschner2023-10-272-1/+76
| | | | | | | | | | Introduces Windows 11 styled progressbar to QWindows11Style drawn by QPainter. The progress is indicated by a thicker line in accent color on a grey track. Animation for indetermined progress is changed to follow the animation of Windows 11 progress bars. Change-Id: Icac79fdbe40b82b10e1fd0e59b389890a7de6683 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce Windows 11 style sliders in QWindows11StyleWladimir Leuschner2023-10-271-4/+188
| | | | | | | | | | | | | | Introduces Windows 11 styled sliders to QWindows11Style drawn by QPainter. The appearance of the slider control element consist now of a circular handle, a rounded slider track and divides the slider track into an accented part left of the handle and a gray part right of the handle. The inner circle of the slider handle is drawn in accented color. The inner circle grows when hovered over and shrinks when pressed. Task-number: QTBUG-113511 Change-Id: I6ca1d27b8b0f69c2cfa07359a7153d38a2f3795e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce accent colored Buttons, Radio-/Checkbuttons in QWindows11StyleWladimir Leuschner2023-10-272-0/+376
| | | | | | | | | | | Introduce Windows 11 styled Buttons, Radiobuttons and Checkbuttons into QWindows11Style. The default button, selected radio option and accepted checkbox are drawn with accent color. The checkmark when accepting a checkbox is now animated to replicate a hand written checking. Flat buttons are subtle highlighted when hovered and pressed. Change-Id: I37c0c21a25ffad427cff361f1b28d3138ff52b09 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update menu behavior to mimick Windows 11 style on QWindows11StyleWladimir Leuschner2023-10-273-5/+232
| | | | | | | | | | | | | | Updated the highlight of hovered menus and menu items to mimick the behavior of native Windows 11 applications. [ChangeLog][Windows] Updated default System colors to use according to guidelines for Windows 10 upwards. [ChangeLog][Windows] On Windows 11, hovered menu and menuitems are now highlighted with darker rounded rect. Task-number: QTBUG-95217 Change-Id: Ibc786aab115650401b054f028da58d69bcbc3462 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce Windows 11 styled ComboBox in QWindows11StyleWladimir Leuschner2023-10-271-1/+48
| | | | | | | | QComboBox is adapted to use the WinUI3 style. Task-number: QTBUG-113513 Change-Id: I300157a7ce9162be73ccd4acfc50b12f7166dc2d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce ListView hover and select behavior to QWindows11StyleWladimir Leuschner2023-10-272-1/+148
| | | | | | | | | Introduce a vertical left line in accent color for the current selected element in a listview and show hovered line slightly darker. Introduce rounded ItemView Headers. Change-Id: I203e14db4ef3a3daf8635d79f227780024177b70 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce TextEdit to QWindows11StlyeWladimir Leuschner2023-10-271-9/+24
| | | | | | | Introduce a TextEdit that is accent colored highlighted when selected. Change-Id: I84813a85a570d37a178c605ec88dab1ad2f04d4e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce Rounded ScrollAreas in QWindows11StyleWladimir Leuschner2023-10-271-1/+20
| | | | | | | | | Introduce a rounded frame around the viewport of a QAbstractScrollArea. This change affects the appearance of QTextEdit, QTreeView, QListView, QTableView and QColumnView. Change-Id: I5fc94ea17415903d74c469f9777a932ca62742d0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce AccentColored LineEdit to QWindows11StyleWladimir Leuschner2023-10-272-0/+40
| | | | | | | | Introduce a rounded LineEdit, which is highlighted in AccentColor when active. Change-Id: Ia836ce8646ec0f8519ac8816d8231440a630b610 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce scrollbars to QWindows11StyleWladimir Leuschner2023-10-272-0/+100
| | | | | | | Introduces Windows 11 styled scrollbars to QWindows11Style. Change-Id: I720f7d68f94c867a9fdd7142ea60fe46a8b7485c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Introduce new empty Windows 11 styleWladimir Leuschner2023-10-2715-35/+172
| | | | | | | | | | | | | | A new empty Windows 11 style plugin is introduced and QWindowsVistaStyle module is renamed to QModernWindowsStylePlugin containing styles for Windows Vista and Windows 11. The color palette is adjusted according to the Windows 11 guidelines. [ChangeLog][Windows] Introduction of Windows 11 specific style. [ChangeLog][Windows] Renaming of QWindowsVistaStylePlugin to QModernWindowsStylePlugin Change-Id: I5f67d7e8c9a3033ffe57ecbaebbf0e3fb10c60ab Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Prevent state change of selected LineEdit in QWindowsVistaStyle when hoveringWladimir Leuschner2023-10-171-8/+8
| | | | | | | | | | | | Hovering over a selected LineEdit gives the selected state precedence over hover state. Fixes: QTBUG-117606 Pick-to: 6.5 6.6 Change-Id: Ia52ce94443100bf3fb5d83b8dffa2752818ca33d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io>
* Show command link button in respective color for windowsvista styleSanthosh Kumar2023-09-151-3/+2
| | | | | | | | | | | | | | The command link button was shown in active color even when its disabled while using windows vista style and the patch e9cf618a9d0ead8711a5fbe563b1c7118c0143c8 further cause regression when hovered over it. This patch fixes it by setting color for corresponding color group in windows vista style. Pick-to: 6.6 6.5 Change-Id: I9a8f62f8c5895592571978ec7c9abccfc69e64a2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove redundant QPair includesAhmad Samir2023-09-061-1/+0
| | | | | | | | Nothing in those files uses QPair; and a local build finished fine without them. Task-number: QTBUG-115841 Change-Id: I669cfecaa9129bce6b31e464826287f138b159db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>