aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename the style pluginsJ-P Nurmi2016-04-221-110/+0
| | | | | | | | | Mention controls2 in the plugin names for the sake of consistency and to achieve a clear deployment structure where all plugin names match with their deployment folder. Change-Id: I73cac5eec341f0d2e6ebaadfaa1796808fcb80e5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix Q_INIT_RESOURCE for Material & Universal style pluginsJ-P Nurmi2016-04-211-1/+1
| | | | | Change-Id: I7e11cb4ddce33a319e73a569a3bcac678995e6a3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-11/+11
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: increase size and paddings for SpinBoxNikita Krupenko2016-04-201-0/+2
| | | | | | Task-number: QTBUG-51254 Change-Id: I2844d9cbe03e7fdda88e358b2f01586ca48f180c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge QQuickPluginUtils to QQuickStylePluginJ-P Nurmi2016-04-191-7/+4
| | | | | | | | | | | Now that we have a common base class for the plugins, we don't need a separate utils namespace. QQuickStylePlugin::typeUrl() is based on the former QQuickPluginUtils::pluginBasePath(). It returns a URL to the internal composite types that must be explicitly registered for static builds. Change-Id: Icf28c27c84f6b58b1e7b34203dad39c852f0d362 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* 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-3/+3
| | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add SwitchDelegateMitch Curtis2016-04-131-0/+1
| | | | | | | | | | | SwitchDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to Switch) to reflect what is most commonly seen on mobile. Change-Id: I6f8fca8d1a8c91f2cb9d8bbbb685ad163712dfa1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add CheckDelegateMitch Curtis2016-04-111-0/+1
| | | | | | | | | | | | CheckDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to CheckBox) to reflect what is most commonly seen on mobile. Change-Id: I6fdac226fe87247052389b2e49f6cf20d7be44fb Task-number: QTBUG-52208 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use the pluginBasePath() to get the right base path for the configurationAndy Shaw2016-04-111-2/+5
| | | | | | | | | Using pluginBasePath() ensures that it finds the qml files in the expected place so it needs to use this to work correctly when statically built. Change-Id: I685a98efc284a7c7d2b6a182f269a09e381a3472 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add internal QQuickStylePluginJ-P Nurmi2016-04-111-13/+16
| | | | | | | | | This is a common base class for QtQuickMaterialStylePlugin and QtQuickUniversalStylePlugin that takes care of the proxy theme installation and manages its life time by using a scoped pointer. Change-Id: I2cbe38287565d284b18fab4265456a41a2dbd8d4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Simplify the style plugins code a bitKonstantin Ritt2016-04-101-13/+6
| | | | | | | | QQuickProxyTheme's destructor restores platform_theme, so keep proxy theme around and destroy it when we don't need it anymore. Change-Id: I2fef7c295251af1cd944cea27531c1c117d34d51 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - style pluginsJ-P Nurmi2016-03-191-0/+110
The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: Ic43c53ee743c40e168722643dacffb966c066a10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>