summaryrefslogtreecommitdiffstats
path: root/src/extras/Styles/Flat/flatstyleplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Enable using the module in a statically built applicationAndy Shaw2016-03-151-3/+12
| | | | | | | 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-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* 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>
* 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-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* Import Qt Quick Extras (the former Qt Quick Enterprise Controls)Mitch Curtis2015-02-131-0/+117
Change-Id: I59c5c97c564f707da4ce617e25e13ff8124f7d4b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>