aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump import versionsJ-P Nurmi2018-03-01256-907/+907
| | | | | | | | QT_VERSION in qtbase has been updated. All the import numbers that now follow the Qt version can be updated. Change-Id: I4e9698201766b39807737c9e0279d36d4da686e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Use horizontal|verticalPaddingJ-P Nurmi2018-03-017-14/+7
| | | | | | | A follow-up commit to 13d56b5. Somehow these were missed. Change-Id: Ief9831797cdda81dd3430b0df0aed2a6050093ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-2726-108/+244
|\ | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_dialogbuttonbox.qml Change-Id: I39ea99d988aaa7d1afd35d573cca44d009b859ce
| * Update plugins.qmltypesJ-P Nurmi2018-02-262-78/+185
| | | | | | | | | | Change-Id: I3b98e4c2159ba37b0b8d0ef5099b93308c84db11 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Update versions in the docs and .prosJ-P Nurmi2018-02-2618-21/+21
| | | | | | | | | | Change-Id: I5b4af1ddfe8c4583731f5a90082d803298bdf9bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix quickCancelDeferred()J-P Nurmi2018-02-261-4/+5
| | | | | | | | | | | | | | | | | | | | Don't assume that declarative data (QQmlData) exists. It doesn't exist for items that have been created outside of QML, which is the case for those content items that are lazily created from C++, for example. Task-number: QTBUG-66669 Change-Id: Ib18455b275034dc2aec6d2405c0c2509d39fc77d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * DialogButtonBox: workaround implicit size calculation with one buttonv5.11.0-beta1J-P Nurmi2018-02-225-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's only one button in the dialog button box, the Default and Universal styles resize the button to cover half of the button box. This works in typical scenarios when the dialog button box is assigned as a footer of a dialog, and thus, gets resized together with the dialog. However, if the dialog button box is placed into a layout, or otherwise not given an explicit size, the implicit size calculation loops until it reaches zero. 1) button box gets the implicit size of the content (one button) 2) button box resizes the button to cover half of the box width 3) button box re-calculates its implicit size => step 1 Avoid the problem by providing a reasonable hard-coded implicit size for this special case. Notice that this is just a temporary workaround to avoid the problem. This can be fixed properly in dev by providing separate contentWidth and contentHeight properties that cleanly propagate the content size to QML. Task-number: QTBUG-59719 Change-Id: I552e0824ae6bff26b570c699252a3e4f09bd3397 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTheme: don't inherit QPlatformThemeJ-P Nurmi2018-02-278-45/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QPlatformTheme as a fallback instead of inheriting from it. This way, Qt Quick Controls 2 themes don't mess up the fonts and palettes of Qt Quick Controls 1 and Qt Widgets applications. Note: QQuickTheme::Font and QQuickTheme::Palette enums are copies of the respective enums in QPlatformTheme, for now. This is the simplest first step, but later on, we can have our own set of enums that cover controls, such as Switch, that were previously entirely missing from QPlatformTheme. Task-number: QTBUG-51921 Change-Id: I8efe0ba2d03d65bc12b55b533ba9f2fab5320348 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix fonts and palettes in apps without :/qtquickcontrols2.confJ-P Nurmi2018-02-262-6/+8
| | | | | | | | | | | | | | | | Obviously theme fonts and palettes must be resolved regardless of QT_CONFIG(settings) and whether :/qtquickcontrols2.conf exists. Change-Id: I471af2af291dc4508f2eb3985b90faa6d530f096 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Use horizontal|verticalPaddingJ-P Nurmi2018-02-2321-44/+22
| | | | | | | | | | Change-Id: I564bf29a859f29d83c94c4428737c0846c1baadb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump QtQuick.Templates import versionsJ-P Nurmi2018-02-23220-220/+220
| | | | | | | | | | | | | | | | | | | | Unlike the other imports that are waiting for a Qt version bump, QtQuick.Templates contains version 2.5 registrations and is therefore already available. Bump the template imports to make the newly added APIs available, so we can start using horizontal|verticalPadding. Change-Id: I651feeeeadcc9767904ca6f191e844a03b8ddea6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTextArea: add placeholderTextColor propertyYulong Bai2018-02-2110-15/+68
| | | | | | | | | | | | | | | | | | | | | | Add placeholderTextColor property for user convenience to customize the placeholderText color to fit the backgrounds. [ChangeLog][TextArea] Added placeholderTextColor property for user convenience to customize the placeholderText color to fit the backgrounds. Change-Id: Iea0233f909ca9cfe19d88f9bc24691aa35b5ab35 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-2112-18/+92
|\| | | | | | | Change-Id: I6cc3095673bb459acef93e3da8a67c3819b70d3a
| * Material: fix ItemDelegate's vertical paddingJ-P Nurmi2018-02-201-0/+2
| | | | | | | | | | | | | | | | Sync with all other delegate types. This makes ItemDelegate less prone to losing 48px height as per the design guidelines. Change-Id: Idf4a097440236c35213ce1cb1e9709776fd8e95f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Imagine: declare missing QtGraphicalEffects dependencyJ-P Nurmi2018-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | DelayButton and ProgressBar are using QtGraphicalEffects. The dependency must be declared in static builds: DelayButton.qml:41:1: module "QtGraphicalEffects" plugin "qtgraphicaleffectsplugin" not found Change-Id: Ic6774a2ebb85e6324ad6e9e222d15120c191a144 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix tst_swipedelegate::test_eventsToLeftAndRight()J-P Nurmi2018-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The test fails with the Fusion style and a static build on Linux. Even if either "dx" or "dy" is defined as 0, TestCase::mouseDrag() drags _at least_ the distance of QStyleHints::startDragDistance() in _both_ directions. Therefore, if we start the drag from the vertical center of the control, a horizontal drag may end below the control and then SwipeDelegate considers the swipe canceled. Change-Id: Ib735ebeb2184d095dfaf0a4c3bdff0bead4bdbd6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * tst_switchdelegate: fix test_mouse/test_touch failuresJ-P Nurmi2018-02-201-6/+6
| | | | | | | | | | | | | | | | | | Same as a1eaa30b for tst_switch. Use the correct coordinates for the middle of the switch. Otherwise this test fails in static builds. Task-number: QTBUG-62241 Change-Id: Ic99babac5c41f5130931790d8cd984fac72cb785 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickStyle: fix and test QT_QUICK_CONTROLS_CONFJ-P Nurmi2018-02-209-1/+50
| | | | | | | | | | | | | | | | Reset QT_QUICK_CONTROLS_CONF when appropriate, and add some tests too since the environment variable is now public and documented. Change-Id: I09fba950de7c34f22c4cf802ea5c0a337c84f0bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Reset QQuickStyle when the QtQuick.Controls 2 plugin is unloadedJ-P Nurmi2018-02-202-9/+34
| | | | | | | | | | | | | | | | | | Cleanup global static data in QQuickStyle when the controls plugin is unloaded (qmlClearTypeRegistrations()). This ensures that the style is resolved as appropriate when the controls plugin is reloaded. Change-Id: Icebb835e057e6063e4fc0ca035c6836560bc7c14 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: use 8 px vertical padding for ItemDelegateMitch Curtis2018-02-213-8/+3
| | | | | | | | | | | | | | | | | | | | All of the other delegates also use 8 px vertical padding. This prevents ItemDelegate from being eager to grow to 49 pixels on certain platforms with slightly larger text heights, like macOS on a MacBook Pro. Change-Id: Id1d6e10af5f0e9c7e9e772bf1d667e32f97c17d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Document the normal and dense Material style variantsMitch Curtis2018-02-215-0/+242
| | | | | | | | | | | | Task-number: QTBUG-51109 Change-Id: I02b7195652a439c184b5a6d7041c1995efd5bbcf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | screenshots: account for header and footer in window heightMitch Curtis2018-02-201-1/+1
| | | | | | | | | | Change-Id: I87e27ea31f5c44049c09ba1b128a38b5d0cc08b0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add Dense Material style variant for desktopMitch Curtis2018-02-1929-53/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | QQuickMaterialStyle: init the globals from the pluginMitch Curtis2018-02-193-74/+70
| | | | | | | | | | Change-Id: I83e754c145becb91cc0fc849434d4843ee24361f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | | | | | Change-Id: I5708cb4d92c52913864fe128e46aa5307c8673af
* | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-1913-38/+53
|\| | | | | | | Change-Id: Id375217229c7f7dc7a8a2dc7edcfd56bbe403952
| * 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-166-11/+11
| | | | | | | | | | | | | | | | | | | | | Use the more specific bottomPadding rather than padding. Change-Id: Ib8823d6d9b07eaea97479ef432df0868b1b5d37d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Material: sync CheckDelegate's vertical padding with other delegatesMitch Curtis2018-02-161-2/+2
| | | | | | | | | | | | | | | Change-Id: I83e5d787d0706dc547a9d906fdafef97e838172f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Document how to position a popup in the center of the windowMitch Curtis2018-02-163-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Examples: don't use anchors in layoutsMitch Curtis2018-02-162-6/+5
| | | | | | | | | | | | | | | Change-Id: I9130e8d143b1f6b2ac6ec2839e47858db3e67dff Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Material: specify the desired button layout in the styleJ-P Nurmi2018-02-173-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates an undesired dependency from QQuickMaterialTheme to QPlatformTheme. Task-number: QTBUG-51921 Change-Id: I43c8ab076118b85cf1ae6c85cf1ee5d3e7b8bc74 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add DialogButtonBox::buttonLayoutJ-P Nurmi2018-02-1710-12/+104
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][DialogButtonBox] Added buttonLayout property that can be used to arrange the buttons. Change-Id: I9160e5df86a0c9444b45ed9f585c50166c145671 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Tumbler: add positionViewAtIndex() functionMitch Curtis2018-02-164-2/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This calls the respective PathView/ListView function (depending on the value of wrap), and allows users to change the current index without animations. [ChangeLog][Controls][Tumbler] Added positionViewAtIndex() function that calls the respective PathView/ListView function, depending on the value of wrap. This allows changing currentIndex without animations. Task-number: QTBUG-66358 Change-Id: I7fe73bd3e53548ef41a165b68637d99f3171e02e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | TextField: restore placeholder text color fixesJ-P Nurmi2018-02-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default values of the placeholder text colors were tweaked in b9584b1, but this was overridden by 77a693c that added a new placeholderTextColor property. Task-number: QTBUG-66176 Change-Id: I706388abdcc19a1c603e76353da79217076a2179 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Tests: cleanup QPlatformTheme referencesJ-P Nurmi2018-02-152-116/+114
| | | | | | | | | | | | | | | Change-Id: I061f99250ea462b002444de33bc0ae0d80dbf4d5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickTextField: add placeholderTextColor propertyYulong Bai2018-02-1510-14/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add placeholderTextColor property for user convenience to customize the placeholderText color to fit the backgrounds. [ChangeLog][TextField] Added placeholderTextColor property for user convenience to customize the placeholderText color to fit the backgrounds. Task-number: QTBUG-66260 Change-Id: I9755ea5ccf2ff416846bdf130dbd352892fd40a2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Cleanup unnecessary explicit references to QPlatformThemeJ-P Nurmi2018-02-154-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTheme is being separated from QPlatformTheme. Reduce references to QPlatformTheme to make the transition to QQuickTheme smoother. Task-number: QTBUG-51921 Change-Id: I6dbbe39bf0b465df16a88bcc26e2b2a32cc42c93 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Move QQuickControlPrivate::themeFont|Palette() to QQuickThemeJ-P Nurmi2018-02-1536-96/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformTheme is too limited for our theming purposes. We need support for separate palettes (and later, icon colors) in dark and light themes. Also, the fact that Qt Quick Controls 2 injects a platform proxy theme does have undesired side effects in Qt Widgets and Qt Quick Controls 1. Therefore, we start separating QPlatformTheme and QQuickTheme. The first step is to eliminate some direct QPlatformTheme access in QQuickControl and route it via QQuickTheme instead. Task-number: QTBUG-51921 Change-Id: I055471a75ed6f26968796496efd1892975447c98 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-1538-355/+679
|\| | | | | | | | | | | Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858
| * | testbench: remove hovered states as the property is read-onlyv5.11.0-alpha1Mitch Curtis2018-02-142-12/+1
| | | | | | | | | | | | | | | Change-Id: Iebc19620b34d9a8a7cc954c9486b739eed1de4a4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | testbench: set checked on ButtonMitch Curtis2018-02-141-0/+1
| | | | | | | | | | | | | | | Change-Id: Ic63b9c17318b357f4f34a5c49ff3d27bb438856c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+49
| |\ \ | | | | | | | | | | | | Change-Id: I695b13b1708265aab9b8d83f4f3dfd1f535e150b
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+49
| | | | | | | | | | | | | | | | | | | | Change-Id: I27b28095a9481b962fe450be9f67b31f36880dac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | | QQuickStackView: transfer focus to the current itemJ-P Nurmi2018-02-132-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51321 Change-Id: I169491d3e04f3ce015f5a999935f45ec02b1b5ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Merge tst_drawer.qml to tst_QQuickDrawerJ-P Nurmi2018-02-132-118/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: I837f6991f5a3b66e3ded9e1408656013a0803d8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Docs: fix qdoc (clang) warningsJ-P Nurmi2018-02-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtquickcontrols2-automotive.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: automotive qtquickcontrols2-musicplayer.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: musicplayer qquickspinbox.cpp:814: (qdoc) warning: Can't link to 'textFromValue()' Change-Id: Iec6fd398cca98b514a76fe9f2f30c79a59b81457 Reviewed-by: Mitch Curtis <mitch.curtis@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>
| * | | Universal Dial: decrease handle size from 20 to 14Mitch Curtis2018-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handle is not interactive; the whole dial is. As it is now, the handle looks way too big. Before and after this patch: https://imgur.com/a/HEbeh Change-Id: I5db93a3e792a2133f765f69566bdd871598ab3b0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 17:50:04 +0000