aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
...
* | QQuickTextArea: add placeholderTextColor propertyYulong Bai2018-02-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | 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-2110-18/+84
|\| | | | | | | Change-Id: I6cc3095673bb459acef93e3da8a67c3819b70d3a
| * 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-208-1/+49
| | | | | | | | | | | | | | | | 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-201-9/+27
| | | | | | | | | | | | | | | | | | 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>
* | Add Dense Material style variant for desktopMitch Curtis2018-02-195-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add DialogButtonBox::buttonLayoutJ-P Nurmi2018-02-171-0/+25
| | | | | | | | | | | | | | | | [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-161-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Move QQuickControlPrivate::themeFont|Palette() to QQuickThemeJ-P Nurmi2018-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-156-180/+409
|\| | | | | | | Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858
| * QQuickStackView: transfer focus to the current itemJ-P Nurmi2018-02-131-10/+21
| | | | | | | | | | | | 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>
| * tst_QQuickPopup: run with all stylesJ-P Nurmi2018-02-121-37/+51
| | | | | | | | | | Change-Id: I0f48ef8bbf0cb7567796dc67f1030d274f684d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * tst_QQuickDrawer: run with all stylesJ-P Nurmi2018-02-121-1/+2
| | | | | | | | | | Change-Id: I3cbd5aa20f48051ab80cf7e83661f17010129450 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-123-15/+299
| |\ | | | | | | | | | Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
| | * Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-092-0/+93
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia407f277cccfdd96242ebfdbe294d699e26e6b1d
| | | * QQuickControl: respect wheel focus policy for focus scopesJ-P Nurmi2018-02-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Control] Fixed focus scope controls to respect wheel focus policy. Task-number: QTBUG-66133 Change-Id: If963feba4b6e59b87ca54af5f6606805093eb0cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Popup: fix restoring focus for popups that did not request focusJ-P Nurmi2018-02-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup closes, if it has active focus, it should restore focus back to where it was regardless of whether the popup originally requested focus. Even if a popup does not request focus on open, it may gain focus programmatically or when a control with click-focus is clicked, for example. Task-number: QTBUG-66113 Change-Id: I9a7c467abe781bbef390d74898d13b9a30b2695b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * QQuickControl: respect click focus policy for focus scopesJ-P Nurmi2018-02-051-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a focus scope explicitly requests click focus, make it gain active focus by clearing the sub-focus child. Pane { focusPolicy: Qt.ClickFocus TextField { } } [ChangeLog][Controls][Control] Fixed focus scope controls, such as Frame, GroupBox, Page, and Pane, to respect click focus policy by clearing a potential sub-focus child. This makes it possible to close the virtual keyboard by clicking the background of a Pane that has Qt.ClickFocus set as its focusPolicy, for example. Task-number: QTBUG-66133 Change-Id: I582f3c66aa6f11e229d89c4f610fae3c6259104d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Make AbstractButton's icon properties win over Action's when both are setMitch Curtis2018-02-051-15/+206
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65193 Change-Id: Idff23dcc35f3c3fe41406678613b022098149318 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Promote QQuick(Proxy)Theme from libQQC2 to libQQT2J-P Nurmi2018-02-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTheme needs to be part of libQtQuickTemplates to be able to provide dark and light palettes (and later, icons). Task-number: QTBUG-63331 Change-Id: If7d3d279a07b6daf6701a1d3cd3686bec1d094b4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Add Control::horizontal|verticalPaddingJ-P Nurmi2018-02-131-0/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common pattern for paddings: padding: X topPadding: Y bottomPadding: Y This pattern can be simplified by providing separate horizontalPadding and verticalPadding properties: padding: X horizontalPadding: Y The actual style changes will be applied separately. As a bonus, the size of QQuickControlPrivate can be reduced a bit since we can move the (has)top/left/right/bottomPadding members to ExtraData. [ChangeLog][Controls][Control] Added horizontalPadding and verticalPadding properties as a convenient way to set both left and right, or top and bottom paddings in one go. Change-Id: I3a93b6f9ab988d806b1f263e74b6bd6b5427fbbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QQuickToolTip: add non-attached show() and hide() methodsYulong Bai2018-02-061-0/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually there's only one global ToolTip instance providing attached show() and hide() methods, here we add non-attached ones which would be more flexible to meet different needs. [ChangeLog][ToolTip] Added non-attached show() and hide() methods to make it more flexible to meet certain requirements. Task-number: QTBUG-62890 Change-Id: I432bca202e16a27d0a5a732445242e78b2fb9c3f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into 5.11J-P Nurmi2018-01-316-0/+63
|\| | | | | | | | | | | Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-312-0/+22
| |\| | | | | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| | * QQuickComboBox: fix popup's deferred executionJ-P Nurmi2018-01-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other delegates, such as background and contentItem, popup is not unconditionally executed upon component completion. For performance reasons, its execution is delayed until the popup is needed, that is, the popup is accessed or shown. When the popup is accessed, we use the current completion status via isComponentComplete() to determine whether its execution must be completed immediately, or if we can wait until componentComplete(). However, if the popup was accessed while the combobox itself was being completed (used in ComboBox's bindings), the popup was never completed because isComponentComplete() was still returning false even though the popup was actually being indirectly accessed from componentComplete(). A simple execution order change, to complete the combobox itself before the popup, fixes the problem. Task-number: QTBUG-65962 Change-Id: I4764eb7e273e7f6fa1dab1a65a02b87722ee7cba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Control: fix background size regression caused by deferred executionJ-P Nurmi2018-01-221-0/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65880 Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | tst_qquickiconlabel: skip colorChanges() that grabToImage() on offscreen ↵Liang Qi2018-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Change-Id: Ifac43dfa26182e3b518397fa070bb4d4a62114e0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | tst_qquickiconimage: skip tests that grabToImage() on offscreen platformsMitch Curtis2018-01-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Task-number: QTBUG-65975 Change-Id: I037110408bd7b676d6ca142808774b29d1aa749f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Fix test_itemsCorrectlyPositioned() failureMitch Curtis2018-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that "moving" is false before comparing the y position of the delegate item. Change-Id: Ie23e86c1f89180c5afca3a48b9361a82635d5e39 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | Fix Action shortcuts in RepeaterJ-P Nurmi2018-01-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickRepeater does not set a QObject-parent, so make QQuickShortcutContext::matcher() start from the object itself and if no window is found, then iterate to the QObject parents. Task-number: QTBUG-65889 Change-Id: I30a1ed0616edd002abcf28d1b8dc7e2d87e99c13 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-25/+37
|\| | | | | | | | | | | Change-Id: I61d779eb40e3a278aa2ef429e014d351da34f80a
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-184-9/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Tumbler.qml src/quicktemplates2/qquicktumbler.cpp src/quicktemplates2/qquicktumbler_p.h src/quicktemplates2/qquicktumbler_p_p.h Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
| | * Make Tumbler compatible with deferred executionMitch Curtis2018-01-174-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the contentItem is created at a different stage, we have to shuffle some code around and add some null checks. Task-number: QTBUG-50992 Change-Id: I34d3a9ea9cb9ab54008a1015b37b1666538c085e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Imagine/Switch(Delegate): cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I621343bef562b4ed85202a0690a0cccfc0a053c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/DelayButton: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I5f2708bc0e9f37232b10e2cd6f1c61ab779156e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/ProgressBar: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-4/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: I1f31b23f3db23e5582b74b18ed643e8263d99142 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/BusyIndicator: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Idee1a13355e36e9221b32cdf9b89b4090dcf87b4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/GroupBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Ied6b4365d03fc1ef3ae3a69667f1cb1fc8cdb9ac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Imagine/SpinBox: cleanup internal IDs for deferred executionJ-P Nurmi2018-01-181-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50992 Change-Id: Iaabd561b2bd009d3db970f370eff6fa717164961 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2018-01-16102-256/+5657
|\| | | | | | | | | | | Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
| * | ComboBox: fix popup's deferred execution for the new stylesJ-P Nurmi2018-01-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Same as 3ec6d04d in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: I211c0e6c0b290c1af310898f21850f9fad01b278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Tumbler: cleanup internal IDsJ-P Nurmi2018-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Same as d61567f in 5.9, but for the new styles in 5.10. Task-number: QTBUG-50992 Change-Id: If47df3796eeadb997bfc76ce6dd6a3b14372ff2b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵J-P Nurmi2018-01-152-9/+94
| |\ \ | | | | | | | | | | | | refs/staging/5.10
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-152-9/+94
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontrol.cpp tests/auto/sanity/tst_sanity.cpp Change-Id: I62a79fd7788fec635b9917fc91bacd7338b547fd
| | | * Tumbler: cleanup internal IDsJ-P Nurmi2018-01-111-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can already cleanup the internal IDs even if Tumbler doesn't have deferred execution enabled. Change-Id: Ide9a0a6c6d1680c6df6b968b5702a6270fea3326 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * tst_sanity: check for internal IDsJ-P Nurmi2018-01-112-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65341 Change-Id: I51bd3390a18e50e37dfdd880dfa8df262d478b04 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 07:09:03 +0000