aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/fusion
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-1052-250/+251
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
| * Make it visually clear which ComboBox item is the current itemMitch Curtis2018-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Do as the Default style does and make the current item bold. If we don't do this, it can be impossible to distinguish the current item from the highlighted item, especially when the popup obscures the button. Change-Id: If40b9c73c207d07fb5669564cdcfcea29ebed2f1 Fixes: QTBUG-68794 Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-0552-250/+250
| |\ | | | | | | | | | Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
| | * Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-0252-250/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-042-3/+1
|\| | | | | | | | | | | Change-Id: I0d2601b897e4cb8ce7a0d562927f3895d1f08f25
| * | qquickfusionstyle: do not force a fixed blue color as highlight colorTimur Pocheptsov2018-11-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | use the one from ... mac system palette. Task-number: QTBUG-70652 Change-Id: I0aa9ab0596ceb8222327d9febbb132fffc3968cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix compilation with qreal=floatFriedemann Kleint2018-11-261-1/+1
| |/ | | | | | | | | | | | | | | Introduce casts where required. Fixes: QTBUG-71952 Change-Id: I63a99d6918bc00367439e967e3c45a733b41c482 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* / Add SplitViewMitch Curtis2018-11-132-0/+57
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SplitView is an important tool for desktop applications that do not want to use a dock widget-style approach for their user interface. It allows users to have some degree of control over the sizing of elements in the UI, as well as the ability to conveniently serialize those sizes so that they're remembered across sessions. The main differences between this and the SplitView in Qt Quick Controls 1 are: - Has its own SplitView attached properties, rather than relying on the Layout attached properties (which required an additional import). - Uses the attached preferredWidth and preferredHeight properties as well as Item's implicitWidth/implicitHeight properties for the preferred size of items, rather than using the width and height properties. - Inherits from Container, so supports most of its API (though some parts of the API, like the currentIndex-related stuff, make no sense for SplitView). - Uses attached SplitHandle properties for the handle delegate to visualize hovered/pressed effects. - Offers convenience API for serializing the user's preferred sizes. [ChangeLog][Controls][SplitView] Introduced SplitView, a control that lays out items horizontally or vertically with a draggable splitter between each item. Task-number: QTBUG-56318 Change-Id: I3da91643ab312eb9ef5b0567da4e758f17747192 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-031-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Menu.qml src/imports/controls/fusion/Menu.qml src/imports/controls/imagine/Menu.qml src/imports/controls/material/Menu.qml src/imports/controls/universal/Menu.qml Change-Id: I017949e5ac617c1cdeece71204e5aa519776fb39
| * Menu: fix items not being scrollable when using WindowMitch Curtis2018-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-252-0/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/imagine/TextArea.qml src/imports/controls/imagine/TextField.qml tests/auto/controls/data/tst_tumbler.qml Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
| * TextArea, TextField: use the control's renderType in placeholder textMitch Curtis2018-06-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The placeholder text's renderType should cohere to the renderType of the control. This is already the case for font, and sometimes color too. This solution avoids the need to expose a new property. Task-number: QTBUG-68769 Change-Id: I6711aea83b7b8ee27f56b9c905aa4870465e3fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Create and init QQuickTheme from QtQuickControls2PluginJ-P Nurmi2018-05-223-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating and setting the QQuickTheme instance from each style plugin (e.g. QtQuickControls2MaterialStylePlugin), create the QQuickTheme instance in QtQuickControls2Plugin when the style is being resolved, and just pass the instance to be initialized by the style plugin(s). This avoids the problem that QQuickTheme API was virtual, and sub-classes created from plugins would have vtables destroyed before the QQuickTheme was destroyed. Task-number: QTBUG-67062 Task-number: QTBUG-68087 Change-Id: I19e9ced5296b708c2668c30163389cb3da6be7cf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Qt Quick Compiler support for external stylesJ-P Nurmi2018-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Quick Controls 2 selects its style when the main QtQuick.Controls plugin is loaded. The style selection procedure resolves styled QML files, such as Button.qml and Slider.qml, from the requested style. The problem was that external styles were not able to embed styled QML files into resources, because the external style plugin had not yet been loaded when the style selection was performed. Only after Button.qml & friends had been registered, and an instance was created, those types would import the style (e.g. QtQuick.Controls.Material). This patch solves the problem by manually loading the external style plugin from the main Qt Quick Controls 2 plugin, in order to gain access to its styled QML files in the resources. The name of the style plugin is read from the qmldir file. Change-Id: I5095ca129e909fb48fd106c87946a6ab9ae88931 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickStylePlugin: prepare for Qt Quick CompilerJ-P Nurmi2018-05-121-6/+6
| | | | | | | | | | | | | | | | | | | | Don't hardcode the URL (QRC in static vs. FS in dynamic), but make use of QQuickFileSelector so the appropriate URL gets chosen "for free". This way, we can later add Qt Quick Compiler support for the internal QML files, such as CheckIndicator.qml. Change-Id: Ie1c55f3d82fbf92d0116966b354298338ef5ace6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-072-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickabstractbutton_p_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquickdialog_p_p.h src/quicktemplates2/qquickdialogbuttonbox.cpp src/quicktemplates2/qquickdialogbuttonbox_p_p.h src/quicktemplates2/qquickdrawer.cpp src/quicktemplates2/qquickmenubar.cpp src/quicktemplates2/qquickmenubar_p_p.h src/quicktemplates2/qquickpage.cpp src/quicktemplates2/qquickpage_p_p.h src/quicktemplates2/qquickpane.cpp src/quicktemplates2/qquickpane_p_p.h src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickrangeslider.cpp src/quicktemplates2/qquickscrollview.cpp src/quicktemplates2/qquickslider.cpp src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquickswipeview.cpp src/quicktemplates2/qquicktabbar.cpp src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h src/quicktemplates2/qquicktheme_p.h Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4
| * Styles: use C++11 default member initializationJ-P Nurmi2018-05-042-3/+2
| | | | | | | | | | Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | TextArea: add support for background insetsJ-P Nurmi2018-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Same as 5adce042 for QQuickControl. [ChangeLog][Controls][TextArea] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Change-Id: I1e1b3a79a9f477ec7b64ec4c6cc8021bbf48adc0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | TextField: add support for background insetsJ-P Nurmi2018-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Same as 5adce042 for QQuickControl. [ChangeLog][Controls][TextField] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Change-Id: Ic1e4c15fd4b06a58f229b5156668c9a986f7bc3f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing implicitBackground{Width|Height} to non-QQuickControlsJ-P Nurmi2018-05-022-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 5bd9d44b for QQuickControl. [ChangeLog][Controls][Label] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. [ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. [ChangeLog][Controls][TextField] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. Change-Id: Idcc2d9af8df086b41c15f352506fd8afdbb2e3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-9/+0
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ic3fa0827ee6719b0a22f73b48667deb129089a6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Take background insets into accountJ-P Nurmi2018-04-2341-81/+81
| | | | | | | | | | | | Task-number: QTBUG-60156 Change-Id: I11f59a67f5a319ac5a4eae9b8ccea5d16a983de2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Align and cleanup implicit size bindingsJ-P Nurmi2018-04-2020-41/+54
| | | | | | | | | | Change-Id: I9f206c3c750fd648ba8761c574e0be94d32e940f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | BusyIndicator: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-191-2/+4
| | | | | | | | | | | | | | | | Even if the default implementation would not have a background, controls should support custom backgrounds that provide an implicit size. Change-Id: I9ceb929cb540b04719cf85343f23ce13d80ea97b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-191-2/+7
| | | | | | | | | | Change-Id: I94885e777a9c24cbde856f10e9dd258d8a72e9e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dial: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-191-2/+6
| | | | | | | | | | Change-Id: I9a08ebd646a720707ed70180b68942be378265b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | GroupBox: add implicitLabelWidth|HeightJ-P Nurmi2018-04-191-2/+2
| | | | | | | | | | | | | | | | [ChangeLog][Controls][GroupBox] Added implicitLabelWidth and implicitLabelHeight properties. Change-Id: Ieae54a3b3044b306cd00f45101c6573b5291352d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dialog: add implicit header and footer size propertiesJ-P Nurmi2018-04-191-6/+6
| | | | | | | | | | | | | | | | [ChangeLog][Controls][Dialog] Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, and implicitFooterHeight properties. Change-Id: I0435d97cf1b6950d1ecbd5825fed1991549c59e5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Page: add implicit header and footer size propertiesJ-P Nurmi2018-04-191-4/+4
| | | | | | | | | | | | | | | | [ChangeLog][Controls][Page] Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, and implicitFooterHeight properties. Change-Id: Ia6de025767e64dd2b44edafc2e7dfdf9a99e3b5f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SpinBox: add up|down.implicitIndicatorWidth|HeightJ-P Nurmi2018-04-181-4/+4
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][SpinBox] Added up.implicitIndicatorWidth, up.implicitIndicatorHeight, down.implicitIndicatorWidth, and down.implicitIndicatorHeight properties. Change-Id: I2cdc4e95f8cc3f0e47ce3b24346781f44809eecd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | RangeSlider: add first|second.implicitHandleWidth|HeightJ-P Nurmi2018-04-181-4/+4
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][RangeSlider] Added first.implicitHandleWidth, first.implicitHandleHeight, second.implicitHandleWidth, and second.implicitHandleHeight properties. Change-Id: Iab68a7a905c4b6515517e3b9eb11c6fd70782764 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Slider: add implicitHandleWidth|HeightJ-P Nurmi2018-04-181-2/+2
| | | | | | | | | | | | | | | | [ChangeLog][Controls][Slider] Added implicitHandleWidth and implicitHandleHeight properties. Change-Id: Id3a67f052a7b234b7eef0e946433e69c3e8add1d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ComboBox: add implicitIndicatorWidth|HeightJ-P Nurmi2018-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | Basically same as 704625a0 for AbstractButton. [ChangeLog][Controls][ComboBox] Added implicitIndicatorWidth and implicitIndicatorHeight properties. Change-Id: I1bc9da1ee7ea99dc04ca4458baa06702a4612628 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-04-181-3/+3
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Page.qml src/imports/controls/fusion/Page.qml src/imports/controls/imagine/Page.qml src/imports/controls/material/Page.qml src/imports/controls/universal/Page.qml Change-Id: I5acf99d0d2009151d6daff9420d79cb06909c873
| * Page: fix implicitWidth bindingsJ-P Nurmi2018-04-171-3/+3
| | | | | | | | | | | | | | | | Don't add paddings to header and footer width when choosing the max. Padding affects content, not headers and footers. Change-Id: I92381762f97eab384b18510522bf788abecd8338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Popup: add implicitBackground|ContentWidth|Height propertiesJ-P Nurmi2018-04-165-14/+14
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Popup] Added implicitBackgroundWidth, implicitBackgroundHeight, implicitContentWidth, and implicitContentHeight properties. Change-Id: I3881b337bbd46b29873e8c00832006eec8b2836a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Qt Forward Merge Bot2018-04-141-0/+146
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-141-0/+146
| |\| | | | | | | | | | Change-Id: Ia5d3c9705e5832df76bb55753dcf38e340afc5b2
| | * Fusion: add plugins.qmltypesJ-P Nurmi2018-04-091-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though there are no public QML types in the QtQuick.Controls.Fusion namespace, we must provide plugins.qmltypes to avoid that tooling tries to run qmlplugindump. Because of the internal .impl namespace, running qmlplugindump doesn't work out of the box. The plugins.qmltypes file has been dumped after deleting all .qml files from QT_INSTALL_QML/QtQuick/Controls.2/Fusion and then manually edited to remove all redundant QQC2 type definitions, leaving only the Fusion .impl type definitions, similarly to what we did with the other styles. Task-number: QTBUG-66276 Change-Id: I39ecfa1cd889ec5013a85dcdf96395fa31e92e57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | AbstractButton: add implicitIndicatorWidth|HeightJ-P Nurmi2018-04-1310-10/+10
|/ / | | | | | | | | | | | | | | [ChangeLog][Controls][AbstractButton] Added implicitIndicatorWidth and implicitIndicatorHeight properties. Change-Id: Ic9459efa76c12ba0df67dae0ffe103b14e011ee6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Use implicitContentWidth and implicitContentHeightJ-P Nurmi2018-04-1324-47/+47
| | | | | | | | | | | | | | A simple search'n'replace change without hidden functional changes. Change-Id: I11c76846028665e66dfc6b4359adb33f77cd88ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Use implicitBackgroundWidth and implicitBackgroundHeightJ-P Nurmi2018-04-1233-66/+66
| | | | | | | | | | | | | | A simple search'n'replace change without hidden functional changes. Change-Id: I8e42f8ad30977630005529094eea726efa15a26d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | DialogButtonBox: add contentWidth and contentHeightJ-P Nurmi2018-04-101-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to f1f884d3, which mentioned that: This can be fixed properly in dev by providing separate contentWidth and contentHeight properties that cleanly propagate the content size to QML. [ChangeLog][Controls][DialogButtonBox] Added contentWidth and contentHeight properties. Change-Id: I4b53702568c55d666bccb587af9fe8c8eba0b63d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickPopupItem: inherit QQuickPaneJ-P Nurmi2018-04-063-9/+0
| | | | | | | | | | Change-Id: Ia32f3004cf540f995344286683d754558369f279 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fusion: remove useless ScrollView.qmlJ-P Nurmi2018-04-052-66/+0
| | | | | | | | | | | | | | | | | | It's identical to Default/ScrollView.qml, which gets selected as a fallback by the style selector. None of the other styles have ScrollView.qml either. Change-Id: If3cdba4ba4810df1a2b389356c45fb7b0c5c58b6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickScrollView: inherit QQuickPaneJ-P Nurmi2018-04-051-3/+0
| | | | | | | | | | | | | | | | | | This allows us to remove duplicate properties, and ScrollView gets Pane's automatic content size calculation, which allows us to remove the respective QML bindings. Change-Id: I96ba98c12d0bf294f19b2c2b3617bfc88326bb41 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickControl: update baseline offset automaticallyJ-P Nurmi2018-04-0417-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | ...unless explicitly defined. All buttons repeated the same binding. [ChangeLog][Controls][Control] Unless explicitly specified, baselineOffset is now automatically updated based on the top padding of the control and the baselineOffset of the contentItem. Styles no longer need to specify the baselineOffset in QML. Change-Id: I9c6f61371fee05a06b5dd31b27d8baf9da0bdeeb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Inherit QQuickPage from QQuickPaneJ-P Nurmi2018-03-091-3/+0
| | | | | | | | | | | | | | | | This allows us to remove a lot of duplicate code, and Page gets the same automatic content size calculation that was added to Pane. Change-Id: I98dc3a5070d61c1720dc11003bc4076aba481b3a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickPane: calculate content size in C++ unless explicitly definedJ-P Nurmi2018-03-094-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No more need for the clumsy and slow contentWidth and contentHeight bindings in Pane and its derivatives. QmlBench on TX1: Pane: 26.4 -> 32.8 frames (~24%) Frame: 25.4 -> 31 frames (~22%) GroupBox: 28.6 -> 32 frames (~12%) Change-Id: I4ba1d46ba6328de2ee0955c241d4b090127f6b85 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-03-011-1/+3
|\| | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquicktheme.cpp Change-Id: I874011d32a379bf982f760c39c46d3a25e2452d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:00:47 +0000