aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/designer
Commit message (Collapse)AuthorAgeFilesLines
* Fix installation of .png filesJoerg Bornemann2019-06-181-1/+1
| | | | | | | | | | | | | | The content of AUX_QML_FILES must consist of valid file paths, not wildcard patterns. The wildcard will produce an invalid installation rule, and since qtbase/20e9422e069a27b7e29b54207447e6ca02b3a55a we're not ignoring installation errors anymore. Fixes: QTBUG-76378 Change-Id: I8498e3559c97cf502cf8b1a5823f1a6775ee2400 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update Qt Creator-related filesMitch Curtis2019-01-311-0/+13
| | | | | | | | | - Add Dial's new inputMode property to DialSpecifics.qml - Update plugins.qmltypes files Fixes: QTBUG-73412 Change-Id: Id9e3818db49d6d130da1256d3019a5074902c66d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-0244-88/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix custom property page for snapeModeThomas Hartmann2018-10-231-1/+1
| | | | | | Change-Id: I013643381229a43b5d8c5c114a9d86156e5e2bd7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-26117-0/+0
|\ | | | | | | Change-Id: Ieff89a2abd82cd12b6d80bcc487e3872b9f63bf6
| * Update icons for Qt Quick DesignerThomas Hartmann2018-05-24117-0/+0
| | | | | | | | | | | | | | | | | | | | We do not provide a 2x version for the 16x16 icon, since the difference is quite subtle and it reduces the maintenance burden. We do not provide those for the other icon sets, too. Change-Id: Ia6914c1abe8bac94ace9659a8b2c46cf3ed5fb56 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-313-0/+67
|\| | | | | | | Change-Id: I655cffde559b94181021646dff617f8529854d70
| * Add a few missing properties to property editorThomas Hartmann2018-03-233-0/+67
| | | | | | | | | | | | Change-Id: I25bfc453bdfdc007ec10a69de92f3f339617c2d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Use AUX_QML_FILES for the Qt Quick Designer support filesJ-P Nurmi2018-03-131-3/+3
|/ | | | | | | | | | | | | The purpose of AUX_QML_FILES (handled in qml_module.prf) is to ensure that certain files, usually provided for tooling purposes, are never embedded into QRC, but always installed on the file system. Currently it's only used for the plugins.qmltypes file, but it works perfectly for the Qt Quick Designer support files too. None of these files should ever be built into QRC, because it would only bloat the plugin, and tools would not even see the files. Change-Id: Id864a1753a7dd8c3729dd4b5113e6e7fe447ad4a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update Quick Designer supportv5.9.3J-P Nurmi2017-11-1046-177/+1578
| | | | | | | Add a lot of missing controls and properties. Change-Id: I7c0ff3cc7fd7220e338d78cac575091ff12abf48 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Add color and styleColor to property editor for LabelThomas Hartmann2017-07-101-0/+24
| | | | | | Change-Id: Ie8ecc3874a61b29083e53441c3f484b94195ec46 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* fix capitalization of item library nameTim Jenssen2017-03-141-1/+1
| | | | | Change-Id: Ie371dced41ed86373aeb0a4600cb0245b4550b7e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* add FontSection to all controlsTim Jenssen2017-03-1422-0/+88
| | | | | Change-Id: I0352376201a1efd318f89a758dd8dc5a269742f4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* add default designer content to tumblerTim Jenssen2017-03-141-0/+2
| | | | | Change-Id: Idcd36f81abf0968c7e85a04c0faf340e4309ef18 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add ScrollView to designer item libraryThomas Hartmann2017-03-103-0/+16
| | | | | | Change-Id: If141c5dd6a0126c49f508590a5addb7f8e4b2159 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Adding stack view and swipe view to designer item libraryThomas Hartmann2017-01-185-0/+32
| | | | | | | | Adding stack view and swipe view to the view category. The icons are taken from stack layout and have no high dpi versions. Change-Id: I4009a9d06117bdd5d725c1c05c46ce7f99c368b5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Adding round button to designer item libraryThomas Hartmann2017-01-175-0/+14
| | | | | | Change-Id: I6409a7036392af7bd160583a9d92982ce9876eac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Welcome to 2017J-P Nurmi2017-01-0930-30/+30
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Adding TabBar and TabButton to item libraryThomas Hartmann2016-09-131-0/+28
| | | | | Change-Id: I3489454f9b9ece4478c91061d1cfd5327422b483 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add ToolSeparatorMitch Curtis2016-07-216-0/+84
| | | | | | | | | | ToolSeparator is used to visually distinguish between groups of items in a toolbar by separating them with a line. It can be used in horizontal or vertical toolbars. Task-number: QTBUG-54862 Change-Id: Ie68e680510428ad19e7f80268063af07b61100eb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update QML Designer supportJ-P Nurmi2016-06-079-2/+64
| | | | | Change-Id: I916ab905ade9c6c83cf4cb8bcf121bdd99e84974 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix typename in .metainfo fileThomas Hartmann2016-05-231-23/+23
| | | | | | | The module name is QtQuick.Controls not Qt.Quick.Controls. Change-Id: I0de337aaec6ea2e133d9f59a63ca468e499ad622 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update qtquickcontrols2.metainfoJ-P Nurmi2016-04-211-69/+69
| | | | | Change-Id: Ida964c89cc2f508823e606e46ce86d87bb96e61d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-201-10/+10
|\ | | | | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
| * Adjust qtlabscontrols.metainfoThomas Hartmann2016-04-121-10/+10
| | | | | | | | | | | | | | | | The '' confuses the designer. We will fix this but for now I change it to "". Change-Id: Ief4cfa3250e1dd1428dd972a7a10c5f6bd417033 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Controls: update license headersJ-P Nurmi2016-04-1429-54/+54
| | | | | | | | | | | | | | 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>
* | Rename .metainfo for QML DesignerJ-P Nurmi2016-04-142-24/+24
| | | | | | | | | | Change-Id: I9b76da5ab1b4a56d78aa0b0beeb7e3d1428fce63 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add SwitchDelegateMitch Curtis2016-04-131-0/+56
| | | | | | | | | | | | | | | | | | | | | | 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 RadioDelegateMitch Curtis2016-04-113-0/+72
| | | | | | | | | | | | | | | | | | | | | | RadioDelegate 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 RadioButton) to reflect what is most commonly seen on mobile. Change-Id: I143ee9a30cd8ce1d624354f4cb981c41dfddc2d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add CheckDelegateMitch Curtis2016-04-113-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add SwipeDelegateMitch Curtis2016-03-152-0/+57
|/ | | | | | | | | | SwipeDelegate presents a view item that can be swiped left or right to expose more options or information. It is used as a delegate in views such as ListView. Change-Id: I7533a2b223f652993b6cee730930ea6dc125c869 Task-number: QTBUG-51610 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add icons for the QML DesignerJ-P Nurmi2016-02-2292-44/+43
| | | | | | Change-Id: If5a2e766eff51fb21d81c44f8313d7fdc2a67678 Task-number: QTBUG-50801 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QML Designer: add a bunch of missing controls and propertiesJ-P Nurmi2016-01-2816-114/+724
| | | | | Change-Id: I29e286b9df08fc531f053158da379c5d6898bada Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove Control::layoutDirectionJ-P Nurmi2015-12-091-14/+0
| | | | | | | | Calculate QQuickControl::isMirrored() from LayoutMirroring.enabled (QQuickItemPrivate::isMirrored()) and QLocale::textDirection(). Change-Id: I0e391d27df732734031f3e94d9828a1a2cfa7474 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Controls: fix metainfo file for Qt CreatorLiang Qi2015-10-031-15/+15
| | | | | Change-Id: I07eed4a316957d0c3f96599d15d3562463032b2f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-0120-64/+64
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove ToggleButtonJ-P Nurmi2015-09-253-97/+0
| | | | | | | | We don't have a sensible design. It's better not to have it at all than to have a confusing tiny bit tweaked clone of Switch. Change-Id: Ib0eabd075590100e9e49846c7172909525b54a57 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QtQuick.Controls: QML Designer supportJ-P Nurmi2015-07-1423-0/+1705
Change-Id: I12aa4b73de8a33fcec1ea603d88cea2fa5a6b231 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 12:25:33 +0000