aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickstyleselector.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QQuickStyleSelector: don't include an empty style name as a selectorJ-P Nurmi2015-12-231-1/+4
| | | | | | | | | | | | | | | | | | | This solves the recently surfaced QML import issue: ASSERT failure in QQmlImportDatabase::importDynamicPlugin: "Internal error: Plugin imported previously with different uri", file /home/qt/work/qt/qtdeclarative/src/qml/qml/qqmlimport.cpp, line 1947 Because QQuickStyleSelector included double slashes, the path ("Qt/labs/controls//") got converted to a uri with an extra dot in the end ("Qt.labs.controls."), which conflicted with the actual uri "Qt.labs.controls". Somehow related to qtbase commit 2e1de7f which changed QUrl behavior with local files. Change-Id: I8236a685a68dcffcd5f03c439236b2e8ea04492e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Make QQuickStyleSelector case-insensitiveJ-P Nurmi2015-12-141-3/+3
| | | | | | | | | | | | | | | | | This is especially nice for qtlabscontrols.conf: [Controls] Style=material vs. [Controls] Style=Material Previously, only the first syntax worked. Change-Id: Ib4a47dca002acb5c0227f3dcfea7251296f8386e Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Remove QQuickStyleSelector::instance()J-P Nurmi2015-12-141-6/+0
| | | | | | | | | | | It was a bad idea to share the same instance, because non-thread-safe instance() ends up being called from multiple threads. Let the style plugins create their own instances instead, QQuickStyleSelector ctor is not that heavy and there's no such shared state as originally was anticipated. Change-Id: Ie23091c6dd50f5d7abbab3b996da4471054da89a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Read preferred style from qtlabscontrols.confJ-P Nurmi2015-12-141-0/+7
| | | | | Change-Id: I3aeed5c8316a099eed5ea8df25711193ee3c7d90 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyleSelector: don't inherit QObjectJ-P Nurmi2015-12-021-16/+8
| | | | | | | | Fixes the "QObject: Cannot create children for a parent that is in a different thread." -warnings. Change-Id: I94ed34c6c4c7a6b6507e91e74a354630b0ad6d04 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickStyleSelector: add instance() static methodLiang Qi2015-11-301-0/+8
| | | | | Change-Id: Id2a412175f9907651d8e4e0fdacb624ac2444552 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyleSelector: move the style detection to constructorLiang Qi2015-11-301-6/+7
| | | | | | | Command line argument has more priority than environment variable. Change-Id: Id76f703d1d4395b6bae1a2e6be162a9250fb8dfa Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyleSelector: removed the env overrideLiang Qi2015-11-301-6/+0
| | | | | Change-Id: I0e42b339ddfff81ad9029cfbff14e21aee5178ff Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickFileSelector to QQuickStyleSelectorLiang Qi2015-11-261-0/+235
Also moved to QtLabsControls lib. Change-Id: I8ed1256da2b9aa63db4ca3b51a0ace3ba730e542 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 02:53:58 +0000