aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
Commit message (Collapse)AuthorAgeFilesLines
* Run optipng on all imagesMitch Curtis2019-11-04143-0/+0
| | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Docs: Update qmlmodule to use QtMinorVersion so that this version is always ↵Kavindra Palaraja2019-10-251-1/+1
| | | | | | | | | up to date Fixes: QTBUG-76077 Change-Id: Ica06051a8ca5dc3858110f5eef47fec20bd2d2c1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-061-0/+45
|\ | | | | | | Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
| * ComboBox: document the behavior surrounding the accepted() signalMitch Curtis2019-09-061-0/+45
| | | | | | | | | | | | | | | | Change-Id: I65be8e54ded284d2f80b5a1f301b75223bd81bb3 Fixes: QTBUG-75338 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-311-1/+1
|\| | | | | | | Change-Id: Ia89d3600269126768ede2305dcf60d968f772fb7
| * Doc: Rename section title for 'TabBar'Topi Reinio2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | Having a section title identical to a QML type name caused links intended to go to the QML reference to link to this page instead. Fixes: QTBUG-77840 Change-Id: I06219a67fd384c51be6080ef7ef8579b6a405d0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Fix the qhp project nameVenugopal Shivashankar2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1abdfe5d5 renamed the doc module without the version no. 2 in the name, but a bug was left behind. The qhp.project name was still called QtQuickControls2, while all the qhp settings in the qdocconf were using QtQuickControls. Task-number: QTBUG-77815 Change-Id: I1e8d10212798a1f4dfedcd7888f846e149851d23 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-2229-173/+177
| | | | | | | | | | | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I354049c5c8edb36cb94afa4483ae177a736f2374 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-07-042-2/+4
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/accessibility/tst_accessibility.cpp Change-Id: I0bc187e2a8edb4e357c1bf114dd9b1977d5c1e45
| * Doc: Fix documentation warnings for Qt Quick Controls 2Topi Reinio2019-01-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | - The correct module header name is QtQuickControls2 - Add dependency to qtgraphicaleffetcs - RangeSlider: Move \qmlsignal commands out of \qmlpropertygroup - Fix linking to content[Width|Height] for ScrollView Change-Id: I1636fef5f4365a8e9f80b0b8df17e78999bfd3f8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * doc - use the correct attributions fileKavindra Palaraja2019-05-201-1/+1
| | | | | | | | | | Change-Id: Ib83e2ec925e0c37b40562aea7f11e09759ce3abc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-061-0/+1
|\| | | | | | | Change-Id: I5b112e0e4021191c387da86bb5b0477fe0c4da30
| * Doc: Add the moduleheader informationVenugopal Shivashankar2019-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Although the doc project is named QtQuickControls, the repo is still called qtquickcontrols2 and the exported headers are installed under QT_INSTALL_PREFIX/include/QtQuickControls2. By default, Qdoc tries to look for the headers in a directory that matches the doc project name, which is not the right include directory in this case. Change-Id: I77889fe35c028a2fc903d49b571a564c57326c21 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: update qtquickcontrols2.differences.qdocMitch Curtis2019-03-141-3/+14
| | | | | | | | | | | | | | Add SplitView and TableView. Change-Id: Ib049d12d6e922269ac80d2e9b10f37f5e274a567 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | SplitView: fix revisions, imports and \since versionsMitch Curtis2019-03-071-2/+2
| | | | | | | | | | | | | | | | Work was probably started before 5.12 but the patch ended up getting merged in time for 5.13. It seems that I forgot to update the versions. Change-Id: I19edf08158cca0967a7a536b3aee326e3b393d4c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-021-6/+23
|\| | | | | | | Change-Id: Ibd3a8a111ce70643199c64f41143f332a34826f8
| * Doc: restructure and fill in Imagine customization sectionMitch Curtis2019-02-251-6/+23
| | | | | | | | | | Change-Id: I1b34fe2df28c734395dc2a55340f2a7cb1629692 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: minor language edit in titleNico Vertriest2019-03-012-2/+2
| | | | | | | | | | Change-Id: Ia84e572f6f16cc050991450a18f2e695e461280d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | 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>