aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypesv5.10.0-beta4J-P Nurmi2017-11-061-36/+36
| | | | | Change-Id: I792cd065a70aaabf2349e1fe2c5b5dc41e29d1d3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix DialogButtonBox revision 3J-P Nurmi2017-11-031-1/+1
| | | | | Change-Id: I63ce1220d39df62b47aa2168d3e358d4a006a638 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-10-251-1/+85
| | | | | Change-Id: Ie5b9a513baa70e88ade9cc4980b81fe6a363edf6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Register new base class revisionsJ-P Nurmi2017-09-061-0/+5
| | | | | | | | QQuickText & QQuickTextEdit have gained new properties in QtQuick 2.10. Make them available in QQuickLabel and QQuickTextArea, respectively. Change-Id: I5156b683efeedd24b23c18d1c2e2509d3040b647 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Introduce MenuBarJ-P Nurmi2017-07-261-0/+4
| | | | | | | | | | | | | | MenuBar is an ordinary Item. It can be located basically anywhere, but the idea is to introduce a new ApplicationWindow::menuBar property in a follow-up commit. Currently the example snippets are using the header property. [ChangeLog][Controls][MenuBar] Introduced a MenuBar control. Task-number: QTBUG-60350 Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add Overlay attached properties and signalsJ-P Nurmi2017-06-261-0/+2
| | | | | | | | | | | | | | | [ChangeLog][Controls][ApplicationWindow] Deprecated the overlay grouped property in favor of the newly introduced Overlay attached properties. [ChangeLog][Controls][Overlay] Introduced Overlay attached properties and signals that supersede the overlay grouped property in Application Window. The Overlay attached type allows providing background dimming for popups without requiring an ApplicationWindow instance. Task-number: QTBUG-61336 Change-Id: I9df11bcb167e7725014d5f058fe24d70da4a10b3 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-06-221-0/+60
| | | | | Change-Id: Id63b835d4590b08c80eee725fdc02c562590b605 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-06-061-53/+137
| | | | | Change-Id: Ibe6d36867c5509e30277d1ae213cf55e9faad0c9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add missing revision for takeItem()J-P Nurmi2017-06-061-0/+1
| | | | | Change-Id: Idac8b830efc228303346432d5bf0957b17a428a4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add QQuickMenuItem::menuJ-P Nurmi2017-06-061-0/+1
| | | | | | | | [ChangeLog][Controls][MenuItem] Added a "menu" property that provides access to the menu that contains the menu item. Change-Id: I5edbf860756ba7ba9aef93d4992720327c10d1df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickMenu::popup()J-P Nurmi2017-06-021-0/+1
| | | | | | | | | | [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add support for propagating palettesJ-P Nurmi2017-05-261-0/+3
| | | | | Change-Id: Icd965d8a79f022f4375e2134621cbc3897014015 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickPalette value typeJ-P Nurmi2017-05-264-0/+253
| | | | | Change-Id: Id4dfb4939d3ea720fe46a4a5171d3e068c8f1fd3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QtQuick.Templates: fix QQuickDialog revision for 2.3J-P Nurmi2017-05-231-1/+1
| | | | | Change-Id: Ide9fb970a70cef2949dd6ed7d5a2d82e96ddbb1a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-201-0/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
| * ApplicationWindow: fix access to revisioned members in base classesJ-P Nurmi2017-05-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inheritance hierarcy is: QWindow <- QQuickWindow <- QQuickWindowQmlImpl <- QQuickAppWindow Each base class has its own set of revisioned members. Import the revisioned members in the base classes to the templates/controls namespace by calling qmlRegisterRevision() with the revision of the base class and the respective templates/controls version. Task-number: QTBUG-60893 Change-Id: I6d91209dc5b2eb17c2b3845675a5ddbffb7e8b72 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing QQuickDialog::standardButton() invokable methodJ-P Nurmi2017-05-191-0/+1
| | | | | | | | | | | | | | | | [ChangeLog][Controls][Dialog] Added a standardButton() method for accessing the standard buttons in the dialog's button box. Change-Id: I7a92a0176985e1bc2c1a82f4bc9e78b813eee802 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickDialogButtonBox: add missing signalsJ-P Nurmi2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | There were no convenience signals for Apply, Reset, and Discard. [ChangeLog][Controls][DialogButtonBox] Added missing applied(), reset(), and discarded() signals. Task-number: QTBUG-59423 Change-Id: I49ccc60672fadf64283ff3a6e043c3892cd291ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Plugins: add missing override keywordsJ-P Nurmi2017-05-161-1/+1
| | | | | | | | | | Change-Id: Ic43604fdb601769e93618cac30d839cc524f1394 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-111-0/+8
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5c6398e4146e62109bef231fe358b7ed69fa9488
| * Fix unresolved external symbols for -no-feature-shortcutStephan Binner2017-05-061-0/+8
| | | | | | | | | | Change-Id: I3ddef9df6100b8837d1bdc81f3fd1dc7cf37babf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Make QQuickIcon a value typeJ-P Nurmi2017-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickIcon no longer inherits QObject, but becomes a light-weight implicitly shared Q_GADGET-type, that is passed by value the same way fonts and colors are. Before: SUB: OS: Fedora 25 (Workstation Edition) SUB: QPA: xcb SUB: GL_VENDOR: Intel Open Source Technology Center SUB: GL_RENDERER: Mesa DRI Intel(R) Haswell Desktop SUB: GL_VERSION: 3.0 Mesa 13.0.4 SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 110 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: Average: SUB: 109.2 frames; using samples; MedianAll=109; StdDev=0.447214, CoV=0.00409536 After: [...] SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 123 frames SUB: 124 frames SUB: 124 frames SUB: 122 frames SUB: 125 frames SUB: Average: SUB: 123.6 frames; using samples; MedianAll=124; StdDev=1.14018, CoV=0.00922472 Change-Id: I604532204fb94fc0726d0c9b8b6097f9ebc265e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ButtonGroup::exclusiveJ-P Nurmi2017-04-281-0/+1
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ButtonGroup] Added exclusive property to allow creating non-exclusive button groups. Change-Id: Ic2f3f4bac852f03e5c25f9010993d62234a71e0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypesJ-P Nurmi2017-04-211-9/+139
| | | | | | | | | | Change-Id: Iaef074c14f3113496128efab68032f53e29eb330 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-211-4/+9
|\| | | | | | | Change-Id: I67d0991de16ad1039848df5099db59ea6aa728f8
| * Update plugins.qmltypesJ-P Nurmi2017-04-211-4/+9
| | | | | | | | | | Change-Id: I106f1efad34b74af68dc59323aa6739212a78976 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add SpinBox::wrapJ-P Nurmi2017-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | QAbstractSpinBox in Qt Widgets has a similar property. [ChangeLog][Controls][SpinBox] Added wrap-property to allow wrapping circular spinboxes. Task-number: QTBUG-58760 Change-Id: Ic3cd36056ed52d61c4ad9cb4170e91ec0618dcb9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ActionGroupJ-P Nurmi2017-04-191-0/+2
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ActionGroup] Introduced ActionGroup, a non-visual group of actions that is mutually exclusive by default. Task-number: QTBUG-50705 Change-Id: Ia33103173441ca8980341b7c94aba0db3264284d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ActionJ-P Nurmi2017-04-101-0/+2
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Action] Introduced Action, an abstract user interface action that can have shortcuts and be assigned to buttons. Task-number: QTBUG-50705 Change-Id: I1986cc7ed13cdf428d51ae38cd196a20493fde8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devJ-P Nurmi2017-04-071-0/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-061-0/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
| | * TextField: make textEdited() availableJ-P Nurmi2017-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | The signal was added in Qt Quick 2.9 and has revision 9. Change-Id: Id1bb0f17ac5d8c9684ab5127782d030b54756e6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Fix alphabetical order (by type name) in registerTypes()J-P Nurmi2017-04-071-6/+6
|/ / | | | | | | | | Change-Id: I94292b7362b9ff342ac31a2583b93d342ab13a71 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-301-1/+1
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/RangeSlider.qml Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
| * Fix AbstractButton 2.2 registrationJ-P Nurmi2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlRegisterRevision() registers a nameless type, so using it would make AbstractButton throw confusingly formatted warnings: QML : <warning> instead of QML AbstractButton: <warning> Change-Id: I6b51824ad019ed9451079cf8a2595e908ef8187e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ScrollIndicator: add horizontal and vertical properties for convenienceJ-P Nurmi2017-03-281-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollIndicator] Added horizontal and vertical properties to make it more convenient to create orientation-dependent bindings in styles. Change-Id: I8670456bb84387af99440ba25ab652c07ec1cb29 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ScrollBar: add horizontal and vertical properties for convenienceJ-P Nurmi2017-03-281-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollBar] Added horizontal and vertical properties to make it more convenient to create orientation-dependent bindings in styles. Change-Id: Id48d17021b663f00d242ffbde06b76407b832f81 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | RangeSlider: add horizontal and vertical properties for convenienceJ-P Nurmi2017-03-281-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][RangeSlider] Added horizontal and vertical properties to make it more convenient to create orientation-dependent bindings in styles. Change-Id: Iac2ae7d4d701cf9516521923cf27416d76dfba5c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Slider: add horizontal and vertical properties for convenienceJ-P Nurmi2017-03-281-0/+1
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Slider] Added horizontal and vertical properties to make it more convenient to create orientation-dependent bindings in styles. Change-Id: Iec3332f873e482590ab4f0cca08323c905527c77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | AbstractButton: add support for iconsMitch Curtis2017-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the following properties to AbstractButton: - icon.name - icon.source - icon.width - icon.height - icon.color Derived types implement the behavior behind these properties using the new private IconImage type. [ChangeLog][Controls][AbstractButton] Added support for icons. The following properties are now available for derived types to use: icon.name, icon.source, icon.width, icon.height, icon.color. Task-number: QTBUG-49820 Change-Id: I3b5e4eaac390543deef60883e13539646a6bb060 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-013-8/+16
|\| | | | | | | Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
| * Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-242-8/+8
| | | | | | | | | | | | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Tumbler requires ListView and PathViewJ-P Nurmi2017-02-021-0/+8
| | | | | | | | | | Change-Id: Ieb40f536cc5d68fdf13075df2c9b3e09d5077de3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update the QML module versions from 2.2 to 2.3J-P Nurmi2017-02-202-3/+3
| | | | | | | | | | Change-Id: Iefb73973e7950246cd364dbb7e47dc096508e4d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickIconMitch Curtis2017-02-091-0/+4
|/ | | | | | | | | | This adds the initial API needed to add support for setting icons on buttons, etc., and is also necessary for action support. Follow up commits will add the actual support for icons. Change-Id: I9ab892aa4fe43210e7b18bed3e0ebcec2edb9c91 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge dev into 5.9Oswald Buddenhagen2017-02-012-0/+13
|\ | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
| * Add ScrollViewJ-P Nurmi2017-01-272-0/+13
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Update QQuickText revision (9)J-P Nurmi2017-01-271-0/+4
|/ | | | | | | QQuickText::forceLayout() was added in Qt 5.9 / Qt Quick 2.9. Change-Id: I6ea6438f9948ccad4fa3060238882db408b7be10 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-01-241-39/+143
| | | | | Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update QtQuick.Templates import versions in the docsJ-P Nurmi2017-01-241-2/+2
| | | | | Change-Id: I5ad6841a507c2488618ec3bf694249fb3b8b4d1c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>