aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-2912-83/+95
| | | | | | | | | | 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>
* 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-08-181-1/+1
|\ | | | | | | Change-Id: I828b8ea2fef35e4e7ab0bb594e683f8643c793a1
| * QQuickPlatformColorDialog - properly initialize platform dialog helperTimur Pocheptsov2018-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | QCocoaColorDialogHelper in its setCurrentColor does some initialization (using NSColorPanel) and required its 'm_options' to be set by this point. So, first set options, then current color. Task-number: QTBUG-69839 Change-Id: I9092c80a511890e958de5b99a9614feb134dba7e Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | qquickplatformmessagedialog: fix build errorMitch Curtis2018-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | Not sure why it's considered ambiguous, but since it's an unknown value, it's fine to print it as an int. Task-number: QTBUG-69916 Change-Id: I50335bd140626aa220e0468aef0fd1b3b34e3042 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Fix build with '-no-feature-action' configurationValentin Fokin2018-07-241-0/+2
| | | | | | | | | | Change-Id: I6a1488ef128f64184dccdd28aa12ff83f9975154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* | Material: qualify DialogButtonBox enums with "T"Mitch Curtis2018-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise strange things happen to innocent pieces of code: DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole qrc:/qml/main.qml:391:17: Unable to assign [undefined] to int Task-number: QTBUG-69286 Change-Id: I6a3c5810c06e0de38af9e87088f08b3e8bae0459 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-036-10/+14
|\| | | | | | | | | | | | | | | | | | | | | 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>
| * Menu: fix items not being scrollable when using WindowMitch Curtis2018-06-255-10/+10
| | | | | | | | | | | | | | | | | | | | Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-2512-1/+73
|\| | | | | | | | | | | | | | | | | 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>
| * TextArea, TextField: use the control's renderType in placeholder textMitch Curtis2018-06-1310-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | The placeholder text's renderType should cohere to the renderType of the control. This is already the case for font, and sometimes color too. This solution avoids the need to expose a new property. Task-number: QTBUG-68769 Change-Id: I6711aea83b7b8ee27f56b9c905aa4870465e3fd9 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>
* | 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>
* | Doc: fix SystemTrayIcon::icon.maskJ-P Nurmi2018-05-241-1/+1
| | | | | | | | | | Change-Id: Ifcfd6f57528784b192eeeb39b3d3672459a0327c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Remove fixupBaseUrl()J-P Nurmi2018-05-231-10/+1
| | | | | | | | | | | | | | | | No longer needed since qtdeclarative commit b8a3b901 that fixed QQmlExtensionPlugin::baseUrl() in static builds. Change-Id: I9a3d04730003c97b9d105593677a2cd588a843f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Create and init QQuickTheme from QtQuickControls2PluginJ-P Nurmi2018-05-2215-128/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating and setting the QQuickTheme instance from each style plugin (e.g. QtQuickControls2MaterialStylePlugin), create the QQuickTheme instance in QtQuickControls2Plugin when the style is being resolved, and just pass the instance to be initialized by the style plugin(s). This avoids the problem that QQuickTheme API was virtual, and sub-classes created from plugins would have vtables destroyed before the QQuickTheme was destroyed. Task-number: QTBUG-67062 Task-number: QTBUG-68087 Change-Id: I19e9ced5296b708c2668c30163389cb3da6be7cf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTheme: add setters to make getters non-virtualJ-P Nurmi2018-05-228-111/+43
| | | | | | | | | | | | | | | | | | | | This allows us to add more themable attributes (on the side of fonts and palettes) after the QQuickTheme API has been made public, because it won't require adding virtuals. Only the resolve() method is virtual. Task-number: QTBUG-67062 Change-Id: I6a5cc8d15aeaa5a9a0fe9b6d2591077f8822daac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dial: add inputMode propertyMitch Curtis2018-05-155-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add Qt Quick Compiler support for external stylesJ-P Nurmi2018-05-135-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Quick Controls 2 selects its style when the main QtQuick.Controls plugin is loaded. The style selection procedure resolves styled QML files, such as Button.qml and Slider.qml, from the requested style. The problem was that external styles were not able to embed styled QML files into resources, because the external style plugin had not yet been loaded when the style selection was performed. Only after Button.qml & friends had been registered, and an instance was created, those types would import the style (e.g. QtQuick.Controls.Material). This patch solves the problem by manually loading the external style plugin from the main Qt Quick Controls 2 plugin, in order to gain access to its styled QML files in the resources. The name of the style plugin is read from the qmldir file. Change-Id: I5095ca129e909fb48fd106c87946a6ab9ae88931 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QQuickStylePlugin: prepare for Qt Quick CompilerJ-P Nurmi2018-05-124-80/+81
| | | | | | | | | | | | | | | | | | | | Don't hardcode the URL (QRC in static vs. FS in dynamic), but make use of QQuickFileSelector so the appropriate URL gets chosen "for free". This way, we can later add Qt Quick Compiler support for the internal QML files, such as CheckIndicator.qml. Change-Id: Ie1c55f3d82fbf92d0116966b354298338ef5ace6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: use background insetsJ-P Nurmi2018-05-0945-189/+226
| | | | | | | | | | | | | | | | | | All others have been updated, except GroupBox that has some strange special handling for positioning the background. Change-Id: Ief5a68cbeedbdc3c66b85e8d03198f70e35aac61 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-0726-131/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickabstractbutton_p_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquickdialog_p_p.h src/quicktemplates2/qquickdialogbuttonbox.cpp src/quicktemplates2/qquickdialogbuttonbox_p_p.h src/quicktemplates2/qquickdrawer.cpp src/quicktemplates2/qquickmenubar.cpp src/quicktemplates2/qquickmenubar_p_p.h src/quicktemplates2/qquickpage.cpp src/quicktemplates2/qquickpage_p_p.h src/quicktemplates2/qquickpane.cpp src/quicktemplates2/qquickpane_p_p.h src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickrangeslider.cpp src/quicktemplates2/qquickscrollview.cpp src/quicktemplates2/qquickslider.cpp src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquickswipeview.cpp src/quicktemplates2/qquicktabbar.cpp src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h src/quicktemplates2/qquicktheme_p.h Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4
| * Styles: use C++11 default member initializationJ-P Nurmi2018-05-0426-131/+95
| | | | | | | | | | Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | TextArea: add support for background insetsJ-P Nurmi2018-05-025-11/+11
| | | | | | | | | | | | | | | | | | | | | | Same as 5adce042 for QQuickControl. [ChangeLog][Controls][TextArea] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Change-Id: I1e1b3a79a9f477ec7b64ec4c6cc8021bbf48adc0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | TextField: add support for background insetsJ-P Nurmi2018-05-025-10/+10
| | | | | | | | | | | | | | | | | | | | | | Same as 5adce042 for QQuickControl. [ChangeLog][Controls][TextField] Added topInset, bottomInset, leftInset, and rightInset properties to control the geometry of the background similarly to how paddings control the geometry of the contentItem. Change-Id: Ic1e4c15fd4b06a58f229b5156668c9a986f7bc3f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing implicitBackground{Width|Height} to non-QQuickControlsJ-P Nurmi2018-05-0211-35/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 5bd9d44b for QQuickControl. [ChangeLog][Controls][Label] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. [ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. [ChangeLog][Controls][TextField] Added implicitBackgroundWidth and implicitBackgroundHeight properties that can be used to simplify complex implicit size bindings. Change-Id: Idcc2d9af8df086b41c15f352506fd8afdbb2e3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-282-6/+8
|\| | | | | | | Change-Id: I6d731149b21d02164220f6cdc485d9e4ae31bd13
| * Ensure that CheckIndicator works with MenuItemMitch Curtis2018-04-202-6/+8
| | | | | | | | | | | | | | | | | | | | This was broken in 99b2fbbc90466c79837c7e68ac5d7a15b2f91699. MenuItem doesn't have a checkState property, so we need to check its checked property instead. Change-Id: I3c2f9b27a1fe81c1de3500fad7e7bbe17ce6e02e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-278-70/+0
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ic3fa0827ee6719b0a22f73b48667deb129089a6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: use background insetsJ-P Nurmi2018-04-256-25/+25
| | | | | | | | | | | | | | | | | | | | Allows easily configuring the insets from the outside. Buttons have normally 6px insets, but for example a large Floating Action Button doesn't. Task-number: QTBUG-60156 Change-Id: I49121c5bd588ff83e7ab9032de42a93872e999e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Replace Material.buttonHeight with Material.touchTargetJ-P Nurmi2018-04-2510-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | The visual height of a Material design Button is 36px in the normal variant, and 32px in the dense variant. The Button has 6px vertical insets to gain 48px touch target height. Rename the old buttonHeight property as touchTarget to make room for the visual buttonHeight that is needed when porting Button to use the newly introduced background insets. Change-Id: Ic2932f71ca75a626ff5e9b0ce9930e1b3f24cf00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypesJ-P Nurmi2018-04-252-32/+186
| | | | | | | | | | Change-Id: I17278688f2ad33536701878c5ac74986a3b52b34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Take background insets into accountJ-P Nurmi2018-04-23211-417/+417
| | | | | | | | | | | | Task-number: QTBUG-60156 Change-Id: I11f59a67f5a319ac5a4eae9b8ccea5d16a983de2 Reviewed-by: Mitch Curtis <mitch.curtis@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>
* | Align and cleanup implicit size bindingsJ-P Nurmi2018-04-20100-212/+278
| | | | | | | | | | Change-Id: I9f206c3c750fd648ba8761c574e0be94d32e940f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add icon.maskJ-P Nurmi2018-04-206-2/+24
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform][Menu] Added icon.mask grouped property. [ChangeLog][Platform][MenuItem] Added icon.mask grouped property. [ChangeLog][Platform][SystemTrayIcon] Added icon.mask grouped property. Task-number: QTBUG-67730 Change-Id: Idf8031b39038fb6b6774ebd2a2dcb32297465a40 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: make icon a grouped propertyJ-P Nurmi2018-04-2012-111/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform][Menu] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. [ChangeLog][Platform][MenuItem] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. [ChangeLog][Platform][SystemTrayIcon] Deprecated iconName and iconSource properties in favor of icon.name and icon.source grouped properties. Task-number: QTBUG-67730 Change-Id: I08bbb2bb5ed2aaae02f9264c63fb6cfa04240a74 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | BusyIndicator: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-194-8/+16
| | | | | | | | | | | | | | | | Even if the default implementation would not have a background, controls should support custom backgrounds that provide an implicit size. Change-Id: I9ceb929cb540b04719cf85343f23ce13d80ea97b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-195-10/+34
| | | | | | | | | | Change-Id: I94885e777a9c24cbde856f10e9dd258d8a72e9e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Dial: follow the "standard" implicit size calculation practicesJ-P Nurmi2018-04-194-10/+26
| | | | | | | | | | Change-Id: I9a08ebd646a720707ed70180b68942be378265b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:30:38 +0000