aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
Commit message (Collapse)AuthorAgeFilesLines
* QQuickIcon: Add support to cache a pixmapMikhail Svetkin2019-01-221-0/+6
| | | | | | | [ChangeLog][Controls] Added cache property to icon. Change-Id: I9b3410e74ab8962d039939a8e005a2aff8e026cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-10120-297/+303
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-05116-292/+293
| |\ | | | | | | | | | Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
| | * Doc: Fix the examplesinstallpath in the qdocconfVenugopal Shivashankar2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Creator tries to look for the example sources in this path, before listing them in the welcome screen. Task-number: QTBUG-71694 Change-Id: I333f380f2f8ada91865474ff95cb0df1affba9cb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Doc: Rename landing page title to 'Qt Quick Controls'Topi Reinio2018-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Quick Controls 2 module is referred to without the version number. The landing page title still had the version number, which caused the table of contents to fail to find the html filename. Fix the landing page title and use the old title as a \keyword, so any external links still continue to work. Task-number: QTBUG-71694 Change-Id: I99e5eabf56028bd8a3180cb7161a0b0dcbdf9863 Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-02115-289/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Doc: Update \titles with "Controls 2" in itVenugopal Shivashankar2018-12-045-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Alternatively, the old \title is now a \keyword, to avoid broken links to the page. Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-043-9/+11
|\| | | | | | | | | | | Change-Id: I0d2601b897e4cb8ce7a0d562927f3895d1f08f25
| * | Doc: add "1" to all mentions of the old Qt Quick ControlsMitch Curtis2018-12-032-9/+9
| | | | | | | | | | | | | | | | | | | | | Be explicit and reduce the chance for confusion. Change-Id: I4bd912660ee32705cd9c7bdc667ccb4e255a302b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | Doc: Add qmake include flag for modulePaul Wicking2018-11-271-0/+2
| |/ | | | | | | | | | | Fixes: QTBUG-63834 Change-Id: I8ba52d68a878ec61337e8111d233409a9a98f47d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* / Add SplitViewMitch Curtis2018-11-133-0/+66
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SplitView is an important tool for desktop applications that do not want to use a dock widget-style approach for their user interface. It allows users to have some degree of control over the sizing of elements in the UI, as well as the ability to conveniently serialize those sizes so that they're remembered across sessions. The main differences between this and the SplitView in Qt Quick Controls 1 are: - Has its own SplitView attached properties, rather than relying on the Layout attached properties (which required an additional import). - Uses the attached preferredWidth and preferredHeight properties as well as Item's implicitWidth/implicitHeight properties for the preferred size of items, rather than using the width and height properties. - Inherits from Container, so supports most of its API (though some parts of the API, like the currentIndex-related stuff, make no sense for SplitView). - Uses attached SplitHandle properties for the handle delegate to visualize hovered/pressed effects. - Offers convenience API for serializing the user's preferred sizes. [ChangeLog][Controls][SplitView] Introduced SplitView, a control that lays out items horizontally or vertically with a draggable splitter between each item. Task-number: QTBUG-56318 Change-Id: I3da91643ab312eb9ef5b0567da4e758f17747192 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-299-80/+86
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-174-1/+111
|\ | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp src/quicktemplates2/qquickscrollview.cpp tests/auto/qquickstyle/tst_qquickstyle.cpp Change-Id: I9afddf07a956f43cf0445e91b8d1a02f167b6bd5
| * Doc: Add AbstractButton.TextUnderIcon to display:enumeration listPaul Wicking2018-07-111-0/+0
| | | | | | | | | | | | Task-number: QTBUG-68298 Change-Id: I049ff1de079f065182429f43a20e1a3899f4a962 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: provide code snippets for Overlay.modal and Overlay.modelessMitch Curtis2018-07-102-0/+110
| | | | | | | | | | Change-Id: I0ea789c0ba3a153b00ac3ab6501ecf10f6c733ce Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Doc: Re-add .qml files as example sourcesTopi Reinio2018-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit dabf5d2e fixed a documentation issue with QML type inheritance by excluding .qml files from the documentation build. A side-effect is that example documentation pages do not list .qml files as part of the example project. Instead of excluding all .qml files, simply exclude '*.qml' from the list of source file extensions. This way, .qml files are still considered to be part of examples. Task-number: QTBUG-69141 Change-Id: I51a6d1768c30cfb9025a1aaf718b93bfae52437a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-031-0/+4
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Menu.qml src/imports/controls/fusion/Menu.qml src/imports/controls/imagine/Menu.qml src/imports/controls/material/Menu.qml src/imports/controls/universal/Menu.qml Change-Id: I017949e5ac617c1cdeece71204e5aa519776fb39
| * Doc: Exclude .qml source files from the documentation buildTopi Reinio2018-06-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple copies (for each style) of .qml files, all without documentation. The types are documented in .cpp or .qdoc files, but QDoc parsed also the .qml source and generated (internal) nodes for these undocumented types - this conflicted with the actual documented types, causing the inheritance information to go missing. To solve this, exclude all .qml files from the build as they contain no documentation. Task-number: QTBUG-69141 Change-Id: If9a84d91f37d5f9431c9ce1d0d079b7fd5159445 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-252-0/+63
|\| | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/imagine/TextArea.qml src/imports/controls/imagine/TextField.qml tests/auto/controls/data/tst_tumbler.qml Change-Id: I25a8228a4299fb7a53db70b7223663a1637ed933
| * Imagine: document how to export 9-patch imagesMitch Curtis2018-06-141-0/+54
| | | | | | | | | | | | Task-number: QTBUG-66834 Change-Id: I8a07e114d230361f21dfbf1458210729b3607d92 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Document which modules are required when building from sourceMitch Curtis2018-06-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | There is currently no indication (in the form of build output) that the user is missing a required module when building from source. QTBUG-68826 suggests that such a feature be added, but until then, we need a way to inform users how to build from source. Task-number: QTBUG-68618 Change-Id: Ic17565aeaaff6aaa9907552d3b0c2646b407b425 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-3/+9
|\| | | | | | | Change-Id: Ifb36ff81047293902c9f9291f724d8e15bca7f3d
| * Imagine: clarify 9-patch line documentationMitch Curtis2018-06-081-3/+9
| | | | | | | | | | | | | | | | | | Explain that the 9-patch lines must be one pixel thick regardless of the intended DPI (e.g. @2x) of the image. Task-number: QTBUG-66834 Change-Id: I57ab0460bf190a67a436dd63543ea0e09812a898 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Dial: add inputMode propertyMitch Curtis2018-05-154-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property adds two new ways of interacting with the dial: horizontally and vertically. These new input modes use a relative input system, which means that, unlike the old absolute input system, changes to the dial's position are "added" to its value. This results in a dial that is less "jumpy", making it safe for operations that could be harmful if done incorrectly, like adjusting audio levels. [ChangeLog][Controls][Dial] Added the inputMode property. This property controls how the dial is interacted with. The circular input mode (default, old behavior) operates on an absolute input system, whereas the horizontal and vertical input modes use a relative input system. Task-number: QTBUG-56323 Change-Id: Iab4e7f048b4797ab626741326ce709914e67bd31 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Popup: add support for background insetsJ-P Nurmi2018-04-233-323/+588
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Popup] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Task-number: QTBUG-60156 Change-Id: I02873f129d2a804986d0db52d1b94899f9219c03 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Control: add support for background insetsJ-P Nurmi2018-04-232-138/+458
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Control] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Task-number: QTBUG-60156 Change-Id: Id8228d32f6a5fffeb771964a153ee062a5a083b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-04-061-2/+2
|\| | | | | | | Change-Id: I509cd2e02874d9a2fe0febf8cc667833b7072b23
| * Doc: use Math.round() in Overlay parent exampleMitch Curtis2018-04-041-2/+2
| | | | | | | | | | Change-Id: Ib8c0688e071781e25ef4fdd8a51e302def32215f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-03-2323-792/+18
|\| | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp tests/auto/controls/data/tst_popup.qml Change-Id: I7b7bb5f9c63b32eef65c9b2e68f56baa3da69cff
| * Ensure that qtquickcontrols2.conf files show up in examplesMitch Curtis2018-03-211-0/+2
| | | | | | | | | | | | Change-Id: Id90ec3a30df73c7e510f388876bc92e552685177 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add a section about how to preview custom styles in Qt Quick DesignerMitch Curtis2018-03-211-0/+16
| | | | | | | | | | | | | | | | | | There was a question about this recently, but our docs aren't exactly clear about it. Change-Id: I152e88f656505aace26b4a517daf79c9df8745c2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Remove unused snippetsMitch Curtis2018-03-2121-792/+0
| | | | | | | | | | | | | | | | These snippets are not referenced by their file names (without extension) by any files in the repo. Change-Id: Ia2cc52fc62dc15a525880678e544e792a64dab5e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add anchors property to Popup to allow centering in parent/windowMitch Curtis2018-03-221-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users must manually position their Popup using x and y bindings: Popup { x: (parent.width - width) / 2 y: (parent.height - height) / 2 } This patch adds an anchors property so that you can do this instead: Popup { anchors.centerIn: parent } It's also possible to conveniently center within the window from anywhere within the scene (106e7b63 also documents an alternative way of doing this using Overlay): Window { id: window Pane { Popup { anchors.centerIn: window } } } QQuickAnchors were never used with Popup, because we cannot use the QQuickAnchors implementation as-is, as the visual QQuickItem parent is not the actual parent item of QQuickPopupItem. Currently just centerIn is supported, as that's the most common use case. [ChangeLog][Controls][Popup] Added anchors.centerIn to Popup to allow a covenient way of centering a popup. Task-number: QTBUG-60354 Change-Id: Ia030f812df9da646fea8f373ef6199a21205ffbd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-101-0/+47
|\| | | | | | | Change-Id: Id5cd236e14238612647f7a897886be0202863132
| * Doc: add a "Focus Management in Qt Quick Controls 2" pageMitch Curtis2018-03-061-0/+47
| | | | | | | | | | | | | | | | This will list each control that is a focus scope, and have some relevant information about focus in Qt Quick Controls 2. Change-Id: I3126452bf73f7d7730d0522d616d61ad0da0dd74 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-03-011-0/+5
|\| | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquicktheme.cpp Change-Id: I874011d32a379bf982f760c39c46d3a25e2452d6
| * Doc: add an "Item Ownership" section toStackView's documentationMitch Curtis2018-03-011-0/+5
| | | | | | | | | | | | | | | | | | It's important that users know the circumstances under which the items managed by StackView will be destroyed. Task-number: QTBUG-66658 Change-Id: I26e287b3dfed44e441125080443bdae4ee1814b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump module versionsJ-P Nurmi2018-03-015-6/+11
| | | | | | | | | | Change-Id: Ifcb0b333769be58263ec5ed662520b97cfc2f79c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-275-6/+6
|\| | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_dialogbuttonbox.qml Change-Id: I39ea99d988aaa7d1afd35d573cca44d009b859ce
| * Update versions in the docs and .prosJ-P Nurmi2018-02-265-6/+6
| | | | | | | | | | Change-Id: I5b4af1ddfe8c4583731f5a90082d803298bdf9bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Document the normal and dense Material style variantsMitch Curtis2018-02-214-0/+239
| | | | | | | | | | | | Task-number: QTBUG-51109 Change-Id: I02b7195652a439c184b5a6d7041c1995efd5bbcf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add Dense Material style variant for desktopMitch Curtis2018-02-191-0/+16
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current Material style is based on the mobile variant of the design, which is far too large for desktop applications. From https://material.io/guidelines/components/lists.html#lists-usage: "When the mouse and keyboard are the primary input methods, measurements may be condensed to accommodate denser layouts." This patch adds a dense variant of the style where most controls like buttons and delegates are smaller in height and use smaller font sizes. Note that the Material design guidelines seem to distinguish between mobile, desktop and dense measurements, where "dense" seems to be a specialization of desktop. We cannot afford to/do not see sense in maintaining three separate variants, so the dense variant will be the only desktop version of the Material style. [ChangeLog][Material] Added Dense variant of the Material style for use on desktop platforms. Some controls are slightly smaller in height and use smaller font sizes. The variant can be enabled by setting QT_QUICK_CONTROLS_MATERIAL_VARIANT to Dense or setting Variant=Dense in the qtquickcontrols.conf file. Task-number: QTBUG-51109 Change-Id: I11846b7f6e61f7b5dcf3c146b18c220234a73ef2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-181-0/+4
|\ | | | | | | Change-Id: I91f8b19e02b7350a2569ab14fe79fe809202e6a8
| * Doc: mention QT_QUICK_CONTROLS_CONF in conf docsMitch Curtis2018-02-121-0/+4
| | | | | | | | | | Change-Id: I7f6d156d54a4c407853af5baa5bf59125ab35bde Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | GroupBox: fix background y and height assignmentsMitch Curtis2018-02-161-2/+2
| | | | | | | | | | | | | | Use the more specific bottomPadding rather than padding. Change-Id: Ib8823d6d9b07eaea97479ef432df0868b1b5d37d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Document how to position a popup in the center of the windowMitch Curtis2018-02-161-0/+20
| | | | | | | | | | | | | | | | | | This was already in Overlay's docs, but not Popup's, so this patch moves the example to a .qdocinc and includes it in both places, creating a new Popup Positioning section in the process. Change-Id: I8e8438919fd849a8466b3a28133d22bb45f7dc19 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Docs: update the version table for Qt 5.11J-P Nurmi2018-02-131-0/+5
| | | | | | | | | | Change-Id: Ib653224d7e30b08ec80b148420717e7e9fec5e7a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into 5.11J-P Nurmi2018-01-313-1/+40
|\ \ | | | | | | | | | Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-312-1/+12
| |\| | | | | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| | * Explain the benefits of customizing a control vs creating a styleMitch Curtis2018-01-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that customizing a control is nice because you don't need to start from scratch with a template. Add a third requirement for "Definition of a Style" that mentions that the top level item must be a template, and why. Change-Id: I4db4ec8311baed46fb45271d107204808ba42592 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>