summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-292-0/+37
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a32df546611d7a8105ad31ed72f54dbac0b1250
| * ComboBox: Update selected text with item textSanttu Lakkala2015-06-231-0/+11
| | | | | | | | | | | | | | | | | | Bind the text of a inactive ComboBox to the text of the selected popup menu item, so that the text updates when the model changes. Task-number: QTBUG-46611 Change-Id: Ieba4d8ee7d9b37390e805a3bde58bf546c5009b1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * Fix TableView extra row with headerVisible:falseJoni Poikelin2015-06-041-0/+26
| | | | | | | | | | | | Task-number: QTBUG-46468 Change-Id: I6718bc860f26a287ff4580e4844aec225c0f70b7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Remove the whole tst_paint test which is failing on all platforms.Jani Vähäkangas2015-06-053-114/+1
| | | | | | | | | | | | Change-Id: I3e7a611e04e9abc64d77fa1a9497760ae28372ed Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-032-37/+30
|\ \ | |/ | | | | Change-Id: Ia13e89e7aaa2a58d15b52d13c0bbd4c4b12c8bf9
| * TreeView auto-test: Remove workaround, use Array APIGabriel de Dietrich2015-05-291-18/+11
| | | | | | | | | | Change-Id: I64309a369065a4d91107527d29c8dfb03dcd738d Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * TreeModelAdaptor: Monitor model's lifespanGabriel de Dietrich2015-05-211-0/+19
| | | | | | | | | | | | | | | | | | | | | | We make the model adaptor behave as if it had no model set if the model gets deleted. Also, while not strictly necessary, using a QPointer adds some extra safety. Change-Id: Ic6963319678acee0097dcddfea36059f9046b093 Task-number: QTBUG-46214 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * Tests: Remove redundant calls to destroy()Caroline Chao2015-05-041-19/+0
| | | | | | | | | | | | | | | | In tst_treeview.qml, destroy() is called in the cleanup() function so it is not necessary to have it in the test functions as well. Change-Id: I580e78c966fa162be23c36c43b59cd6226688941 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-197-18/+419
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/TextArea.qml Change-Id: I1edc6fa3b51e58d9aa290c9d099cac2e85ea176c
| * Menu: Add aboutToShow, aboutToHide signalsGabriel de Dietrich2015-04-161-0/+30
| | | | | | | | | | | | | | | | | | | | | | These do the same as for QMenu, and are emitted right before the pop-up is shown or hidden. On Mac, these signals are emitted by the QPA plugin and relayed by QQuickMenu. Task-number: QTBUG-40576 Change-Id: I59113d8d9cc8c5b3140f4f552772d33dd0b6e138 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * TreeView: Add indexAt() functionGabriel de Dietrich2015-04-161-0/+57
| | | | | | | | | | | | | | Change-Id: I6a8105d074fd71d9d0dff35d07ba1622093e1d4b Task-number: QTBUG-45351 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * TreeModelAdaptor: Take into account childless expanded itemsGabriel de Dietrich2015-04-161-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing or moving items, we may call lastChildIndex() with an invalid index because we're not checking for childless items which can be expanded (think about expanding an empty directory). Same thing when relayouting an item. The solution requires testing for the actual children count since hasChildren() count return true even when the item has no children. Change-Id: I0fa6de41e20c6cb2433f8846449e9f1a2989ce91 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix text selection handles to float on topJ-P Nurmi2015-04-161-3/+0
| | | | | | | | | | | | Task-number: QTBUG-42538 Change-Id: Ia6d38819c994dcd9713958faf0c17de2023c9f25 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Fix TreeView missing visualization of expander image on insert or removeFilippo Cucchetto2015-04-141-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | The current implementation doesn't emit the datachanged signal on the hasChildren role during insertion or remove of rows. This could cause the missing visualization of the expander images in the view. This happen when a new row is inserted inside a leaf node or when a previously not leaf node becomes a leaf because its last child has been removed. Change-Id: I4145cb6bd58fe2efeb38c5c14f10657d956fc6ed Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * MenuBar top level menus are not closed on click after being openedFilippo Cucchetto2015-04-142-19/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix revert partially what was done for resolving QTBUG-40391. Infact the change QTBUG-40391 caused the propagation of the events that caused the dismiss of a popupMenu. This in turn caused this bug where the click that should close menu is forwarded instead of being swallowed. However for supporting the behavior of context menu outside menubar we added some cases where the developer expect to receive the event that dismissed the popup. The use case is to reopen a dismissed popup on right click (see windows right click behavior on right clicks) Task-number: QTBUG-45315 Change-Id: If5a181b65ed9d879521ac20de577510908125169 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * Added QQuickMenu reference in QQuickMenuPopupWindowFilippo Cucchetto2015-04-133-3/+75
| | | | | | | | | | | | | | | | | | | | QQuickMenuPopupWindow has not direct reference to the QQuickMenu that created it. This is useful for navigating back from the popup to the QQuickMenu Change-Id: I6b11641ef90c423df9961277bb3e89573d1ed0e0 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Improve distribution when snapping to the pixel grid.Jan Arve Saether2015-04-152-3/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pixel snapping could sometimes cause gaps/spacings between items sometimes got 1 pixel too wide. This wasn't too much of an issue when it varied between 6/7 pixels, but was of course quite noticeable when the spacing was supposed to be 0 pixels. The layout engine has been updated to take care of this, and this patch will remove the old "snap to pixel grid" patches, and instead use new the functionality provided by the engine Task-number: QTBUG-41216 Change-Id: If1f473c350370fca0ed9dff5ff6aa9c2c442c293 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Say hello to StackLayoutJan Arve Saether2015-04-131-0/+448
| | | | | | | | | | | | Task-number: QTBUG-44077 Change-Id: I85dadc0950617728bca83d5c72ed5a086352b57d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-085-17/+299
|\ \ | |/ | | | | Change-Id: I1dc9d8f652e68700dbb5e5ed5ca970b91abf6b5a
| * Fix clicking on a QML submenu causes it to closeFilippo Cucchetto2015-03-294-0/+282
| | | | | | | | | | | | | | | | | | Shielded the menu triggered signal by checking if the given menu item has a submenu. In this case the sub menu is opened and the triggered signal is not emitted. Task-number: QTBUG-40720 Change-Id: I175b5eddc50fcc5b21c41044096d93b3c04e133d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Port and re-enable tests using the selectedIndexes property.Stephen Kelly2015-03-281-21/+21
| | | | | | | | | | Change-Id: I3ac45d50a5ebf75801e10d64b0661c0809e1e9a5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Temporarily disable tests which use selectedIndexes()Stephen Kelly2015-03-251-4/+4
| | | | | | | | | | | | | | It is to become a Q_PROPERTY. Change-Id: Ie11b2c0c7884cd13bee24c30dd474aece09ede4f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-231-11/+18
|\ \ | |/ | | | | | | | | | | Conflicts: src/layouts/qquicklinearlayout_p.h Change-Id: I6a1777e5d097790edbd442058f12bea0ba337d65
| * Make TreeView auto-tests pass pending list to array changesGabriel de Dietrich2015-03-201-11/+18
| | | | | | | | | | | | | | | | | | | | This should be updated once the two following patches are merged, https://codereview.qt-project.org/107687 https://codereview.qt-project.org/107973 Change-Id: I89a9ee29f4234a489971463e4035d1bc9863d677 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devJ-P Nurmi2015-03-11128-2719/+3519
|\ \ | |/ | | | | Change-Id: If515f72dd9651b482cda7afd76895aefa745fa57
| * Tests: Fix cleanup in tst_shortcut.qmlCaroline Chao2015-03-091-1/+1
| | | | | | | | | | | | | | | | rootObject must be destroyed at the end of the entire test run, and not between data runs. Change-Id: I7e93209a74debee38bc8ae5f6af923fc971de64b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * BSD license for QML code in testsJ-P Nurmi2015-03-06128-2718/+3518
| | | | | | | | | | | | Change-Id: Ie45c9b8d5a5d7f92e4b835473b0c76e3a83998b5 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devFrederik Gladhorn2015-03-0628-117/+370
|\ \ | |/
| * tst_treeview: Enable tests using mouse double clickCaroline Chao2015-03-031-24/+25
| | | | | | | | | | Change-Id: I721dbda1ef45f78a178d7d901dd530039cb66906 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Merge Extras' styling system into Controls'.Mitch Curtis2015-03-0227-69/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * TreeView: Always update selection current indexGabriel de Dietrich2015-02-251-19/+4
| | | | | | | | | | | | | | This gets us closer to the classic item views behavior. Change-Id: I1f9ccdaa1c91e807a8726715a520dd0006c6e988 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Be more explicit about color comparison failures in Picture auto tests.Mitch Curtis2015-02-191-5/+12
| | | | | | | | | | Change-Id: Ibc408bf80703636d3e81be3d94dcd406d27998e4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| * Ensure Picture auto test background window is white.Mitch Curtis2015-02-191-0/+5
| | | | | | | | | | | | | | | | Some grabImage-based color comparisons assume that white is the background color, and seem to fail otherwise. Change-Id: I9b355be50fcff24ec33e98df248a197117c97b41 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | TextArea: add editingFinished signalLiang Qi2015-03-032-0/+89
|/ | | | | | | | | | Autotest is included. [ChangeLog][TextArea] add editingFinished signal Task-number: QTBUG-44734 Change-Id: I9d717e6d87c4e45bf2ab447c0a6958b055f993ff Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Added remove function to the SplitViewFilippo Cucchetto2015-02-161-0/+83
| | | | | | Change-Id: Ie30e76356716a546f7eaa3e4c2eccbc15ebf9a5c Task-number: QTBUG-42509 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Introducing TreeViewGabriel de Dietrich2015-02-1310-3/+2406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TreeView, as currently implemented, extends the TableView by adding support for hierarchical models. In the broad sense, it remains a list view with columns, like TableView. The main architecture is based on TreeModelAdaptor, that wraps the hierarchical model. It keeps track of which items are expanded or collapsed, and also relays model changes to the view. (TreeModelAdaptor is a private type and should be considered as an implementation detail.) The TreeView only supports QAbstractItemModels for the time being, and, just like TableView, relies on roles to pass the data to the view. This also means that model columns are not supported. Selection is supported by ItemSelectionModel which exposes part of the API of QItemSelectionModel. For this, support has been added for QModelIndex and related classes. This requires importing QtQml.Models 2.2 should an actual usage of the TreeView use selection. In the same way, TreeViewStyle currently extends TableViewStyle with the relevant features, like branch indicator. [ChangeLog][QtQuick.Controls] Introducing TreeView With-Help-From: Caroline Chao <caroline.chao@theqtcompany.com> Change-Id: Id3dba240a732744571e4a646b7b98678ab522da6 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Import Qt Quick Extras (the former Qt Quick Enterprise Controls)Mitch Curtis2015-02-1332-2/+3791
| | | | | Change-Id: I59c5c97c564f707da4ce617e25e13ff8124f7d4b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use TabFocusBehavior in QStyleHints in QtQuick.ControlsLiang Qi2015-02-1317-43/+16
| | | | | | | The all usages of qt_tab_all_widgets in test were updated. Change-Id: I35393c67f183c4e0695e869553007ea00d38c06a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devJ-P Nurmi2015-02-121-0/+30
|\ | | | | | | | | | | | | | | Conflicts: src/controls/TableView.qml tests/auto/controls/data/tst_gridlayout.qml Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
| * Fix crash when invalidating a layout while rearrangingDaiwei Li2015-02-051-0/+31
| | | | | | | | | | | | | | | | | | | | Queue the invalidations and upates while rearranging and apply them after. If we do them during, we can delete the items being arranged, leading to a crash. Change-Id: Ic3fe25c52afd1c8d36644f3cf7e3377ba3bec9c1 Task-number: QTBUG-44139 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* | BasicTableView refactoring: Separate view from user interactionGabriel de Dietrich2015-02-122-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the main tasks of the user interaction code is to manage the current items selection. However, in the upcoming TreeView, the selection will be completely different, but we still want to keep 99% of the view code. Also, in our TreeView implementation, the user's model is proxyfied by a TreeModelAdaptor. But that's not the case in the TableView. So, in order to keep using the same API, we introduce the __model intermediate property. Where it makes sense, TableView and TreeView share common API through BasicTableView. Change-Id: I0a922c1c1093919df7d880d72fe12ed0f372cc08 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Tests: update license headersJ-P Nurmi2015-02-11120-3361/+3011
| | | | | | | | | | | | | | Change-Id: I364c2ee1983f59f4c1b3e4e411b46f71c85599ee Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devJ-P Nurmi2015-02-032-2/+66
|\ \ | |/ | | | | Change-Id: I8dbf36b760f72a60b745197367b812185ead8133
| * Fix asynchronous loading of Calendar.Mitch Curtis2015-02-021-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, adding the days of the week to the header model on component completion caused some (six) of the delegates to never be loaded. Instead, we assume that for most cases, the locale will be en_US, and only change the model via setProperty if this is not the case. This is enough to cause the delegates to be loaded properly. Change-Id: Ic399be4b3c9e252fec4eafac84bd9d44c61c1150 Task-number: QTBUG-41481 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Not update TabView.currentIndex when loader insertingLiang Qi2015-02-021-0/+17
| | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-43701 Change-Id: I60664d78988ee8d099e502e49711d69552e08312 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix wrong calculation of "other" margins in splitviewJan Arve Saether2015-02-021-6/+7
| | | | | | | | | | | | | | | | | | | | The code was quite bogus, as it accessed item, which already was out of scope. The code should evaluate the "other" margin for each iteration in the loop, similar to how its evaluated for implicitWidth. Change-Id: I1e58b1f1ac8296ece550d1af173280ceb2fa2f8b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Allow override of passwordCharacter in TextFieldStyleDaiwei Li2015-02-021-0/+16
| | | | | | | | | | | | Task-number: QTBUG-41276 Change-Id: If384db2387d8e08459fd65c18fdc1541fdf4c084 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add support for Layout.margins in SplitViewJan Arve Saether2015-01-171-0/+44
| | | | | | | | | | | | | | Task-number: QTBUG-39724 Task-number: QTBUG-41559 Change-Id: I59ab8a4848fb3e0178eea15c068c21a61a6f8082 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* | Add support for Layout marginsJan Arve Saether2015-01-161-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the way to achieve this is to make a proxy item in a layout: RowLayout { Item { Text { anchors.fill: parent anchors.margins: 9 } } } using Layout margins you can now skip the proxy item and instead write: RowLayout { Text { Layout.margins: 9 } } Note that this is not the same as margins in the QLayout world, as this only controls the margins between the layout container and its items. This feature adds margins to each individual item inside the layout The real logic is done by the container classes: Layouts has the additional logic to adhere to them. SplitView will be done in a separate commit. Task-number: QTBUG-39724 Task-number: QTBUG-41559 Change-Id: I9c5c2a1e0ee43c1200b62009216c9f64d2875baf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devJ-P Nurmi2015-01-1646-29/+1512
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/controls/data/tst_stackview.qml Change-Id: I54b55d51452e812315f97bcdfd1a8e361a427f56
View Lorry Controller Status