summaryrefslogtreecommitdiffstats
path: root/src/extras/Styles
Commit message (Collapse)AuthorAgeFilesLines
* Add missing overrideAlexander Volkov2020-05-251-1/+1
| | | | | | Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-311-0/+3
|\ | | | | | | Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
| * Fix incomplete QPainterPathv5.15.0-beta2Allan Sandfeld Jensen2020-03-101-0/+1
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: Ib481c9f8454ccc1b7398e2c03b1db16c310ec7e2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Fix build after header shuffling in qtbaseSimon Hausmann2020-03-101-0/+2
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: I3f3f1537f1f6c8b27306aedcd38d056e0fa984b2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Add missing includesJan Arve Saether2020-03-271-0/+2
|/ | | | | Change-Id: I9ad8cdc6b603896932619aba8afbef6ab12717ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-121-0/+1
|\ | | | | | | Change-Id: I1d6fd78aa3b9ef7899a14c95c5e06b2d44458d80
| * Add missing depends entry for QtQmlAndy Shaw2019-11-061-0/+1
| | | | | | | | | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Adapt to new Connections syntaxUlf Hermann2019-10-205-11/+11
|/ | | | | | Change-Id: I299baf89f2530250a333736bb31f4ae470610176 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Make restoreMode on all Binding elements explicitUlf Hermann2019-10-042-3/+7
| | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-131-0/+0
| | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-11/+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: Ieb67edec480eba18cdad29f39b262cfb8839bf8a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-1/+1
| | | | | Change-Id: I39eb6cd5c6be80b14597b666c6fee05978be26ce Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Calendar: make locale property publicMitch Curtis2017-06-161-2/+2
| | | | | | | | | | | | | | | This is useful to set a locale on a specific calendar, as opposed to using the application-wide default. plugins.qmltypes was also updated. [ChangeLog][Calendar] Added locale property, which affects which day is shown as the first day of the week, as well as date and day name localization. Task-number: QTBUG-60217 Change-Id: I113298a3f3b6dd407d26f3f55ed6973e73ab6a4c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-1/+1
|\ | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-152-4/+14
| | | | | | | | | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0444-528/+660
|/ | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fix proxy menu crashJ-P Nurmi2015-11-171-0/+1
| | | | | | | | | | | | Mobile-centric ApplicationWindowStyle implementations (Flat & Android) use a proxy menu to morph menubar items into a single menu button. The items are owned by the menubar and must not be deleted by the proxy menu. Otherwise, depending on the destruction order, the items would get deleted twice. Change-Id: I92d0c45fc3274574fd1edf34d8d3d081990f2727 Task-number: QTBUG-48927 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-1/+1
|\ | | | | | | Change-Id: I7177ee6f1dc74d7f0d2ac9a3aedcc8d7a00cee41
| * Fix compile error when building Qt in a namespace on OS XAndy Shaw2015-10-081-1/+1
| | | | | | | | | | | | Change-Id: I1c9e3edf401b4a6b02bafe4086a57679b4ada79c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | GroupBoxStyle: work around Binding regressionMitch Curtis2015-10-221-2/+2
|/ | | | | | Change-Id: I1541593e3aed08a82a0041a68c93a3cb753236fc Task-number: QTBUG-48918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Flat style: set correct classname to enable static linkingRichard Moe Gustavsen2015-09-091-1/+1
| | | | | | | | | | The classname in qmldir needs to match the name of the c++ class that represents the plugin. Otherwise qmlimportscanner will be confused. Task-number: QTBUG-47489 Change-Id: Iac56803127cad7bf072f29c611936df16dcf32d4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Revert "Fix qrc path prefix in flatstyleplugin"Andras Becsi2015-04-091-1/+1
| | | | | | | | | This was incorrectly based on an outdated version and caused "qmlRegisterType requires absolute URLs" errors when the plugin was loaded. Change-Id: If106e542d80f44d8acac7501271409f0ecfa8c3e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix qrc path prefix in flatstylepluginAndras Becsi2015-03-171-1/+1
| | | | | | | | The prefix should start with ':/' instead of 'qrc:/'. This fixes 'File not found' errors when using this style. Change-Id: Ie49e009fcf935d9bbb5f9ea9fb8e17d4766f270e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge Extras' styling system into Controls'.Mitch Curtis2015-03-0237-3740/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ToggleButton: correct text color.Mitch Curtis2015-02-241-1/+1
| | | | | | | | It was FlatStyle.mediumFrameColor ("#b3b3b3") but should be FlatStyle.darkFrameColor ("#999999"). Change-Id: I63c1a870fa064f2d7f99843cbe80c8d44822df78 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Import Qt Quick Extras (the former Qt Quick Enterprise Controls)Mitch Curtis2015-02-1375-0/+8487
Change-Id: I59c5c97c564f707da4ce617e25e13ff8124f7d4b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 02:44:35 +0000