aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-2/+78
|\ | | | | | | Change-Id: Ide4b85626dd153b534c39a3afa2f3b9e732badf5
| * Fix QQuickSlider::valueAt()J-P Nurmi2017-11-071-2/+4
| | | | | | | | | | | | Task-number: QTBUG-64065 Change-Id: Id77a85ce5b88c20795e9f7fe9d2ece974f46a315 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Qt.labs.platform: declare and register enums to the meta systemJ-P Nurmi2017-11-062-0/+74
| | | | | | | | | | | | | | | | | | To make them correctly available in QML so that they also work as signal arguments. Task-number: QTBUG-64259 Change-Id: I5fa00871f96357d924661c4b8af323a0f1748c9d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-11-064-7/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickbuttongroup_p.h src/quicktemplates2/qquickrangeslider.cpp src/quicktemplates2/qquickrangeslider_p.h src/quicktemplates2/qquickswipeview_p.h src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextfield_p.h Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
| * tst_scrollbar::test_overshoot(): use createTemporaryObject()J-P Nurmi2017-11-031-3/+1
| | | | | | | | | | Change-Id: Ic98b332c5e30104c4a3c74a873caafa9065d6b5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Manual tests viewinqwidget: Fix buildFriedemann Kleint2017-11-032-4/+6
| | | | | | | | | | | | | | The resource file gallery.qrc was removed, load from path instead. Change-Id: I167c3f967f8a73bf0de9ffe1658c00970b3d8075 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickTextField: retain selection on right mouse button clickJ-P Nurmi2017-11-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTextField wants to emit pressed(), released(), and pressAndHold() signals not only on left, but on all mouse button clicks. Therefore it explicitly sets accepted mouse buttons to all. However, the base class, QQuickTextInput, has only been prepared to handle left (selection) and middle (paste) mouse buttons. Don't pass right mouse button -only events to the base class to avoid it clearing selection on right click. Task-number: QTBUG-64048 Change-Id: I015820c78995cc8dd7cbeb16fca0f9b991040bad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Improve tst_snippetsJ-P Nurmi2017-11-021-4/+4
| | | | | | | | | | | | | | | | Make sure dynamically created QML components are destroyed when going out of scope, and print out the error when creation fails. Change-Id: Ie0ed785780cb861dd057adda8f4da399dd4986d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Visualize mnemonicsJ-P Nurmi2017-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately this comes a bit late in the 5.10 cycle, but this should be released together with the rest of the mnemonics stuff going out in 5.10, because it affects the value of AbstractButton/Menu(Bar)Item::text. As the removed TODO comments and altered tests indicate, previously the ampersand was blatantly stripped out. It would be worse to change it later once people have already started using mnemonics and rely on the behavior in custom styles. The necessary modifications to QQuickText were added in qtdeclarative commit 65ef4ba. Task-number: QTBUG-61422 Change-Id: Iaa73da8c012e9a6019743cf98f5bdc02527064e5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: merge SwitchIndicator back to Switch & SwitchDelegateJ-P Nurmi2017-11-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the previous commit (CheckIndicator) for more details. Before: running: /home/jpnurmi/Projects/qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml [...] Average: 87.8 frames; using samples; MedianAll=87; StdDev=2.16795, CoV=0.0246919 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml [...] Average: 92.6 frames; using samples; MedianAll=92; StdDev=2.19089, CoV=0.0236597 Change-Id: Iea9e88e4e771ac27d336c2c87232704d33a226ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: merge RadioIndicator back to RadioButton & RadioDelegateJ-P Nurmi2017-11-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the previous commit (CheckIndicator) for more details. Before: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml [...] Average: 91.6 frames; using samples; MedianAll=91; StdDev=1.51658, CoV=0.0165565 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml [...] Average: 95.8 frames; using samples; MedianAll=96; StdDev=2.04939, CoV=0.0213924 Change-Id: Ic185241767d0b9422e86919356e3155e00803e56 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: merge CheckIndicator back to CheckBox & CheckDelegateJ-P Nurmi2017-11-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal CheckIndicator helper was introduced together with CheckDelegate in 1acb34a, because we naturally wanted to share the indicator instead of duplicating it. This change is controversial, because it leads to duplicate code, but keeping the indicator definitions inline is clearly faster. This is not seen as a huge problem for the Default style, because the indicator is not too complicated. Basically, this fixes a ~5% performance regression introduced by 1acb34a. Before: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml [...] Average: 72.8 frames; using samples; MedianAll=73; StdDev=1.48324, CoV=0.0203742 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml [...] Average: 77 frames; using samples; MedianAll=77; StdDev=1.41421, CoV=0.0183664 Change-Id: Ibee0e29e83a64ee4a6a772a90b1784a9c8c715bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-2/+12
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/MenuItem.qml Change-Id: Id4cae0e53a58796694ad1fc9f8380b317ee62984
| * Fix outdated BSD license headerKai Koehne2017-10-231-2/+12
| | | | | | | | | | Change-Id: Ibec1396de3e929a229e1550b8045d687aa5a513c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | QQuickSpinBox: fix internal setValue() argumentsJ-P Nurmi2017-10-271-0/+5
| | | | | | | | | | | | Task-number: QTBUG-64075 Change-Id: Ifd48b6d0075ab1930be3d759b18292b5038bcc17 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickIconImage: fix crash with image providersJ-P Nurmi2017-10-232-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | QQuickImageBase::load() cannot call until the component creation is completed, because it requires an associated QML engine. All calls to updateIcon() are guarded with the appropriate isComponentComplete() check, but the sourceSizeChanged() signal was connected directly to updateIcon(). Establish the signal-slot connection at component completion to avoid calling updateIcon() to soon. Task-number: QTBUG-63959 Change-Id: I3c935291796dbae031d2728e1d51c55596a51cd0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-223-15/+82
|\| | | | | | | Change-Id: I9188f94e40e2ecb4da1963ce2fcf915ab7a4b4fb
| * Speedup tst_pageindicatorJ-P Nurmi2017-10-191-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | test_interactive() was iterating the entire rectangle 2px around each indicator pixel by pixel and sending mouse clicks and touch presses + releases at each coordinate. This resulted to a total of 845 mouse clicks and 845 touch presses and releases. Select a few interesting coordinates to reduce it down to 40 mouse clicks and touch presses and releases. Change-Id: Ie3439aae8481e019956c49d2d82067dac8741b8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickContainer: fix itemSiblingOrderChanged()J-P Nurmi2017-10-171-3/+27
| | | | | | | | | | | | | | | | | | | | | | The problem was that QQuickContainer started already moving items while QQmlObjectModel was creating items and QQuickRepeater was initializing the order. Don't reorder items during the creation, but only after component completion. Task-number: QTBUG-61310 Change-Id: I13380c5ab6b3bddaad3fa03ef6fb028622b4cd11 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickToolTip: disable hoverJ-P Nurmi2017-10-121-0/+31
| | | | | | | | | | | | | | | | | | | | Tooltips are special popups that should not block hover, because it conflicts with the typical condition for showing tooltips on desktop platforms. Task-number: QTBUG-63644 Change-Id: Ie974aed23a7df8e4b926bec5fe717cb909d15842 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | remove blacklistsShawn Rutledge2017-10-222-24/+0
| | | | | | | | | | | | | | | | Task-number: QTBUG-62668 Task-number: QTBUG-62628 Task-number: QTBUG-62631 Change-Id: If3220bf00a4729573be4b85755897586105b55a2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | 9-patch export plugin for SketchJ-P Nurmi2017-10-181-1/+1
| | | | | | | | | | | | | | | | This plugin crops upscaled 9-patch PNG assets when exported from Sketch, to ensure that 9-patch borders remain 1px wide when upscaled. Change-Id: Iad46d75f37b76eecf64ac32fa38d2b9e9db8b34d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_sanity: fix "empty filename passed to function" warningsJ-P Nurmi2017-10-181-3/+6
| | | | | | | | | | Change-Id: Ia1e633af6c64c9e2d538a2d4076e0bdd9667e01e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add manual test for SystemTrayIconFriedemann Kleint2017-10-166-0/+170
| | | | | | | | | | Change-Id: Icada48c4f819906c6a1fc6bd98dd18e64bf1471b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-10-124-5/+62
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickbuttongroup.cpp src/quicktemplates2/qquickoverlay.cpp tests/auto/controls/data/tst_buttongroup.qml Change-Id: Iae23aaf039c6095007966475294e93220dbead84
| * Ensure that the last screenshot can be openedMitch Curtis2017-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | Ensure that lastSavePath (now lastSaveUrl) is converted to a URL correctly by constructing it from screenshotsDir rather than screenshotsDirStr. It was resolved as a qrc path previously. Change-Id: I5ccdad6166b3927a149875b6ff89ff53c2440c05 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * tst_combobox: attempt to stabilize test_mouse()J-P Nurmi2017-10-021-1/+1
| | | | | | | | | | | | | | | | Disable hover to avoid unexpected changes. Task-number: QTBUG-60480 Change-Id: I22fab5c95daa42f3c84437072bce49cac5c705af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickScrollView: fix binding loop with wrapping TextAreaJ-P Nurmi2017-09-281-0/+25
| | | | | | | | | | | | | | | | | | | | Start keeping track of the content size only after the component is complete, to avoid creation time ping pong with content size updates and content item resizing. Task-number: QTBUG-62325 Change-Id: I4b75dc398d0b746dd7e0b04291270f47f91bb7e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickButtonGroup: track the checked button with a QPointerJ-P Nurmi2017-09-281-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | A destroyed button removes itself from a group, but because of the workaround added for QTBUG-52358, there's a moment after clear() when a button is removed from a group and before it is added back to the group. If the button gets destroyed during that period, the group ends up with a dangling pointer. Task-number: QTBUG-62946 Task-number: QTBUG-63470 Change-Id: If994f87b221a7e77f56458866c4d132365c45d6f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickAction: don't uncheck the checked action of an exclusive groupJ-P Nurmi2017-10-091-0/+41
| | | | | | | | | | | | | | | | The logic is adapted from QAction::activate(). Task-number: QTBUG-63674 Change-Id: I7af127ea917e40e6a8ca99c2528362cf6ad283b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickActionGroup: add missing default propertyJ-P Nurmi2017-10-091-0/+19
| | | | | | | | | | | | Task-number: QTBUG-63674 Change-Id: I7e8eef4080f123ba5ad6b9ffa8bd8613c1b7b724 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: fix modal dialogJ-P Nurmi2017-10-061-1/+1
| | | | | | | | | | | | | | Background dimming was disabled for modal dialogs. Change-Id: I52f544364b59387249b96d4db243ad3a0982c322 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Improve testbenchMitch Curtis2017-10-064-236/+292
| | | | | | | | | | | | | | | | | | - Add a "Fix Custom Assets" action with shortcut - Organize the settings dialog into groups so it's easier to see which options are Imagine-only. Change-Id: I20fe7ba63b3bf7770f6ca553780c47f021217ea2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: fix orientation for horizontal ScrollBar & ScrollIndicatorv5.10.0-beta1J-P Nurmi2017-10-042-2/+2
| | | | | | | | | | Change-Id: I1badecf98edb5174aa4cca71553e68bf20692801 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: add SpinBox states and tidy up existing onesMitch Curtis2017-09-291-3/+5
| | | | | | | | | | Change-Id: I2d0cb1f5ec9073670fa00a86fa1ac85bd50b8373 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add cover flow screenshot of stylesMitch Curtis2017-09-295-0/+470
| | | | | | | | | | Change-Id: I4ffcdbc519bd3e997552b5f4c1c81e01d5b1185c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: add TextArea, TextField examples with placeholderTextMitch Curtis2017-09-282-5/+24
| | | | | | | | | | Change-Id: Ib185b7b7592861c3ff5cf22050af7a5dfd5d4af2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-2762-117/+116
|\| | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
| * Rename tst_menu to tst_QQuickMenuJ-P Nurmi2017-09-279-16/+16
| | | | | | | | | | Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_applicationwindow to tst_QQuickApplicationWindowJ-P Nurmi2017-09-2714-23/+23
| | | | | | | | | | Change-Id: If9fc2bb41cf251af71479b25656240e0d3c238d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_popup to tst_QQuickPopupJ-P Nurmi2017-09-2717-34/+34
| | | | | | | | | | Change-Id: I98f7081e94672a4454c33841934158ae82e9388f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_Drawer to tst_QQuickDrawerJ-P Nurmi2017-09-2718-34/+34
| | | | | | | | | | Change-Id: I186b3ed95eda5178f861bc501be481c971641767 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: add MenuBarJ-P Nurmi2017-09-272-0/+80
| | | | | | | | | | Change-Id: I51adbdce78e535294faac33ba73a99149ef63f19 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: allow focus in delegatesJ-P Nurmi2017-09-275-0/+10
| | | | | | | | | | | | | | | | QQuickItemDelegate sets Qt.NoFocus by default, but in testbench it's useful to be able see keyboard focus. Change-Id: I7a33cd5087279d111831d489cab1be8d93b60ec7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: fix Switch labelJ-P Nurmi2017-09-271-1/+1
| | | | | | | | | | Change-Id: I12fac13118cf27d7ed391df33a5a0a551a8764ef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: move the scrollbar on the window edgeJ-P Nurmi2017-09-261-1/+6
| | | | | | | | | | Change-Id: I52af7be7cbd838108cd9e18366afea90e26387a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: make the search case-insensitiveJ-P Nurmi2017-09-261-1/+2
| | | | | | | | | | Change-Id: Ib14404986acd377ad00f19d8b7ec719dd0deeb16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: ensure that assets are reloaded properlyMitch Curtis2017-09-262-6/+22
| | | | | | | | | | | | | | | | Clear the view's model, otherwise it will keep the old items around with the old assets, even after clearing the pixmap cache. Change-Id: If27400c0940448b337d1a4cd3ce0d6c99e2d9ddd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: add modal and dim states for DialogMitch Curtis2017-09-261-1/+5
| | | | | | | | | | Change-Id: Ic7ed3b9712bb0e0e3e3eaa74ab10877b9ed86069 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Replace testbench with newer "style testbench"Mitch Curtis2017-09-2553-940/+4970
| | | | | | | | | | | | | | | | | | | | | | | | The style testbench was developed to provide a way for designers to test out their Imagine style assets, but since it is now more feature-rich than the old testbench, it seems like a good idea to replace it. The tool is described in README.md. Change-Id: I9abec1bc294fd176e2255e067af280b378961551 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>