aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/qquickstyleselector.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Let specifying the fallback style for custom stylesJ-P Nurmi2016-10-251-17/+46
| | | | | | | | | | | | | | | | | | For example, you can call QQuickStyle::setStyle(":/mycontrols") and QQuickStyle::setFallbackStyle("Material") to select a custom style so that the missing files will fallback to the Material style. Notice that the Material and Universal styles do not contain all files. For example, the non-visual Control.qml, Container.qml are not duplicated. For these, we must fallback to the Default style that is guaranteed to contain them all. [ChangeLog][Controls] Added support for specifying the fallback style for custom styles via :/qtquickcontrols2.conf, QT_QUICK_CONTROLS_FALLBACK_STYLE or QQuickStyle::setFallbackStyle(). Change-Id: I00be1c8c6aaca875ef851c90d018e9b5e2f501b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Use QFileSelectorPrivate::selectionHelper()J-P Nurmi2016-05-301-30/+3
| | | | | Change-Id: I0d37dd650e7be4e160d4d49dcb3c678c54f12218 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Optimize QQuickStyleSelectorJ-P Nurmi2016-04-261-9/+8
| | | | | | | | | | | QQuickStyle::name() accesses a Q_GLOBAL_STATIC and splits the style path. Don't call it repeatedly, but store the value in constructor to share it for all consequent select() calls. QQuickStyleSelector is allocated on the stack in QtQuickControls2Plugin::registerTypes(), so memory usage is no concern. Change-Id: I31c1693bca277911232e3cbd7cb6f55b2aa7ed2a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyleSelector: fix relative path handlingJ-P Nurmi2016-04-251-2/+6
| | | | | | | | | | | | This makes it possible to pass a relative path to the style: ./myapp -style relative/path/to/my/style To make the tests pass, includes a fix to avoid double slashes in selected URLs. Change-Id: I1b366eb7793523dd0f1058236661cedaa1216f3d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyleSelector: re-use QFileSelectorPrivate::platformSelectors()J-P Nurmi2016-04-251-34/+3
| | | | | | | Better not to duplicate this code, because it will easily get out of sync. Change-Id: I9a5eb97cee2c3d15ebc4af157cee3d54d4a9e700 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyleSelector: don't force lowercase style nameJ-P Nurmi2016-04-211-1/+1
| | | | | | | | | | | We'll have to also implement case-insensitive style lookup later. For now, this is required to be able to rename the imports, because the styles will reside in folders called "Material" and "Universal" instead of "material" and "universal" as they were before. Change-Id: I71edf1d447d78440a79241e53cb674f85b872078 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-131-0/+193
Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 18:14:46 +0000