summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1015-22/+221
|\ | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * tst_extras: skip crashy test_resize() on WindowsJ-P Nurmi2016-05-031-3/+5
| | | | | | | | | | | | | | Task-number: QTBUG-53123 Change-Id: If7b33d46828808d869a7e325a908a8a353c35f57 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * tst_extras: skip crashing test_resize(PieMenu)J-P Nurmi2016-05-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | This has been consistently blocking the qt5 integration, and nobody is able to reproduce the crash locally or when running tests manually in the CI. We don't even know where exactly it crashes, but this change skips the test that we assume to be problematic. Change-Id: Ia5665a542890b90a296d5d068c14e78fc9c3c625 Task-nubmer: QTBUG-53123 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * tst_extras: change QML TestCase visibility bindingsJ-P Nurmi2016-04-298-8/+8
| | | | | | | | | | | | | | | | | | | | Let QML TestCase be implicitly shown together with the internal test window. The visibility binding to windowShown is unnecessary, and might cause extra visibility state changes, which in turn may cause other issues further down the chain. Change-Id: I59654c4035185ddcbc1e2c4c231f9a6d76d12383 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * make use of COPIESOswald Buddenhagen2016-04-281-6/+3
| | | | | | | | | | Change-Id: I232cf933b20e53ea7403a993edfe00c5eda5a0b1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * tst_extras: create animation as child of controlJ-P Nurmi2016-04-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...and let it destruct together with the control. tst_extras::Tests_Common::test_resize(PieMenu) is constantly crashing in the Win 10 CI. This is a random shot attempting to solve the crash. We're not able to reproduce the issue locally or even when running the test manually on the CI. Change-Id: Iee717cdcf4b05273c05833856a9b5fd18443ca82 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Increase window size in tst_gauge.qmlMitch Curtis2016-04-271-1/+1
| | | | | | | | | | | | | | A width of 60 is too small on Windows, and was causing warnings. Change-Id: Iae4f643fcc9c30a561720b653151cad7ba6d0f20 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve DialStyle's valueToAngle() tests and documentationMitch Curtis2016-04-181-0/+10
| | | | | | | | | | | | | | | | The minimumValueAngle and maximumValueAngle variables it mentions are private. Change-Id: Ib95c96aeb218c8624857c212429f6c4e4e77ece2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Dialog: allow proper resize and default size for contentAlberto Mardegan2016-04-134-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Dialog use implicitly positioned items as content. This makes impossible to use item, that can be properly resized with change of dialog window size and has proper default size (set implicit width and height). This change made it use implicit size if there is one item or fallback to previous algorithm, that use childrenRect for explicitly sized and positioned items, so it won't break behavior of the existing applications. [ChangeLog][Dialog] Proper resize and default size for content Task-number: QTBUG-49058 Change-Id: I7fa4da7d5fd39d47f60ba9f43c88f78e75739b0a Initial-patch-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * Skipping quickcontrols: Test_TreeView::test_indexAt()Milla Pohjanheimo2016-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | Because of bug QTBUG-47523 we need to skip this test until it is fixed properly. Remove the 'skip' after the bug is fixed. Task-number: QTBUG-47523 Change-Id: I4ba514ac7cc38026ced16f8e12bea6e8ac329818 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
* | Add support for QT_QUICK_CONTROLS_1_STYLEJ-P Nurmi2016-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. [ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE environment variable, which takes priority over the existing variable QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-083-0/+0
|\ \ | |/ | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Purge sRGB chunks from PNGs in tests.Edward Welbourne2016-03-293-0/+0
| | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (Some needed -force but did get smaller.) Change-Id: I56774d04c4a0397ae183cd70d8edd7f9f0cfcb22 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Make tst_piemenu compatible with QML SignalSpy changesJ-P Nurmi2016-03-211-7/+7
| | | | | | | | | | | | | | See qtdeclarative 2e7d4ec. Change-Id: Ib2a0562a2810127924f0a80253fb93518aa511e5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Controls: append "1" to all C++ classesMitch Curtis2016-03-181-33/+33
| | | | | | | | | | | | | | | | | | | | This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Correct scrolling direction when using SlidersMorten Johan Sørvig2016-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Account for OS X "direct"/"inverted"/"australian" scrolling. This ensures that a touchpad right/left/up/down flick will move the slider handle in the same direction as the flick. This takes advantage of the recent addition of QWheelEvent::inverted in qtbase Change-Id: If51ec6f0cbc12a042a92aa55964633c9521469a9 Task-number: QTBUG-35972 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-291-3/+97
|\ \ | |/ | | | | Change-Id: I1bf9c0967db59e25ed7fd848269246d611364f4b
| * Added test for keyboard navigation in submenusFilippo Cucchetto2016-02-161-3/+97
| | | | | | | | | | | | | | This should test QTBUG-41951 Change-Id: I262f3e7ca1573dcfb149f3ae942e17817d2e1caf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Move Qt Quick Layouts to qtdeclarative repoJan Arve Saether2016-02-262-1957/+0
| | | | | | | | | | Change-Id: Ia82322488e804ba40d4c91d0bc7e6431ebe973be Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-163-12/+47
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/dialogs/qquickabstractfiledialog.cpp src/dialogs/qquickfiledialog.cpp Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
| * Extend manual test viewinqwidget.Friedemann Kleint2016-01-273-12/+47
| | | | | | | | | | | | | | | | | | | | Show both QQuickView/createWindowContainer and QQuickWidget. Make it work with shadow-builds by passing the full path of the source via define. Task-number: QTBUG-49097 Change-Id: Idbad3a28ae4f803fea57e94c5750224fa5aa1e1e Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-04129-387/+1677
| | | | | | | | | | | | | | Updated BSD license headers Change-Id: I73d67dbc6dbbe7c58d2b9c301b46fb6163243095 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0429-522/+290
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I2b4c7522e5ec10dc7e9422886a20802d53929f30 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-215-1/+193
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Import tst_objectcount benchmark from qtquickcontrols2J-P Nurmi2015-12-233-0/+178
| | | | | | | | | | Change-Id: Id898b5e3d5182ee6dcb09758298d4cb0fed3bea8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-161-1/+1
| | | | | | | | | | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01 Task-number: QTBUG-49794 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Fixed missing close of the ComboBox when clicking on itFilippo Cucchetto2015-12-071-0/+14
| | | | | | | | | | | | | | | | | | | | The mouse event that dismissed a popup window should not dispatched to the visual item. Otherwise the menu open again. Task-number: QTBUG-44532 Change-Id: Id8aca1634e4f1795e546230953bff49518589714 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove insignificant flag from dialogs testTony Sarajärvi2015-12-041-3/+0
| | | | | | | | | | | | | | Task-number: QTBUG-30513 Change-Id: I6a3220237898400d756edf7b3894006e6b4e6e3b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-025-4/+65
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_menubar.qml Change-Id: I23c3299e6f6cef14093aa4f79b3e7d769c063064
| * Menubar popups should handle only release events of a previous press eventFilippo Cucchetto2015-11-261-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is brought up by a press event for a menu inside the menubar it should not handle the relative next release event if it falls outside the popup. Before forwarding the release event we first check if a previous press event was seen, if not we simply discard the event. Task-number: QTBUG-47295 Task-number: QTBUG-45117 Change-Id: I632fab0a3abfdfc9872f85f99f9d7f50d41526cc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix tst_treeviewJ-P Nurmi2015-11-241-2/+2
| | | | | | | | | | Change-Id: I662eea96b72043d06fe94707e77a9ead5a951e3d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Skip controls tests when touch screen is present.Friedemann Kleint2015-11-173-0/+30
| | | | | | | | | | | | | | Task-number: QTBUG-49359 Task-number: QTBUG-49360 Change-Id: I96ec6d46de189ec396ef26c0d059c65360da4ec0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Skip PieMenu tests when touch screen is present.Friedemann Kleint2015-11-171-0/+11
| | | | | | | | | | | | Task-number: QTBUG-49353 Change-Id: I285f058f7df9cceb9d9c52bd822cd3ad772627fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-057-3/+143
|\ \ | |/ | | | | Change-Id: I5d230ebc7c3646fce983cb21892cc3ce42854256
| * Fix CircularGauge's tickmark labels all being set 0Mitch Curtis2015-11-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were relying on model.get() to somehow reevaluate after we'd updated properties of model items, which somehow worked until 4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e. The correct approach is to do the same thing as we do for styleData.index: rely on the model properties that are exposed to the delegate, which do get updated. Change-Id: I529ab7dcc142187fc185b11658dc5e1496b6d6db Task-number: QTBUG-48839 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * BasicTableView: Use ListView's overlay header for the table headerGabriel de Dietrich2015-11-032-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previoulsy we manually positioned the table header over the table contents, which required some manual tweakings. Since 5.4, ListView support overlay headers that we can use them to clean our code in BasicTableView. There is, however, a small issue on Mac where the vertical scrollbar (specially in non-transient mode) is displayed below the table header. Since the header can't span beyond the ListView boundaries, we need to account for the vertical scrollbar width in the ListView's content width. This patch also updates the Desktop style to set the transientScrollBars property and some small tweaks to the Base style. Change-Id: I4433d0703328f23eadb0ae4563fbef5bba0168db Task-number: QTBUG-34344 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-283-0/+121
| |\ | | | | | | | | | Change-Id: I7177ee6f1dc74d7f0d2ac9a3aedcc8d7a00cee41
| | * Allow ComboBox to select items with empty textNikita Krupenko2015-10-261-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox checks selected text like a boolean value. This check is unnecessary and prevents from item with empty text could be selected. [ChangeLog][ComboBox] ComboBox is now able to select items with empty text. Task-number: QTBUG-42127 Change-Id: Ifaa0598d17c85cee099c88f4e03092137ba17c70 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Avoid real-rounding glitches near ends of a slider's range.Edward Welbourne2015-10-212-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | Floating point doesn't quite reliably satisfy certain standard identities of arithmetic ... Task-number: QTBUG-42358 Change-Id: I7417feedbfc1fd6f59510e0ee6d07d98ff7ddc46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * | Adding animation interval for tumblerKarim Pinter2015-10-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending the Tumblers setCurrentIndexAt method with timeinterval, which is set to the animation so while it changes it can move slower then default. Task-number: QTBUG-48680 Change-Id: Ic8e76c604bad928ae7b11cfbea76c11d5d295f80 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-144-3/+34
|\ \ \ | |/ / | | | | | | Change-Id: I27600aa69f6c236229f80f7d4a278f5ab9640f6b
| * | Qt Quick Extras: remove insignificant_test CONFIG flag.Mitch Curtis2015-10-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Add qtgraphicaleffects as a dependency to sync.profile. Change-Id: I8f0d0be2f05aeb193ecdd296d7eeedb6cc90fac5 Task-number: QTBUG-46393 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-10-023-2/+34
| |\ \ | | |/ | | | | | | Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
| | * Fix failing Tumbler tests on OS XMitch Curtis2015-10-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | By default, it’s not possible to tab into certain controls. Change-Id: Ia0941e5016926f65ab58a7391d6271d15b0c5248 Task-number: QTBUG-46393 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| | * Menus: Clean popup hide and destroy logicGabriel de Dietrich2015-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a menu popup gets closed it usually needs to be destroyed right away since we don't recycle its contents. There is an exception, however, and it's when he user triggers a menu item. In this case, we need to proceed in three steps. First, we hide the menu popup, then we emit the triggered signal, and when that one returns, the menu contents can be disposed. If we did all in a single step, we may end up with a crash since we don't support deleting a QtQuick item while it's running a signal handler. Delayed deletions don't work either in the case when the triggered handler ends up running the event loop. Task-number: QTBUG-45182 Task-number: QTBUG-47682 Task-number: QTBUG-48382 Change-Id: Ic39717e09f38df602f641250cd81cf4931863db6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * Merge 5.5 into 5.5.1Oswald Buddenhagen2015-09-111-0/+22
| | |\ | | | | | | | | | | | | Change-Id: I6a887182dbed50c8028bd2dbed71e48d5226fac8
| | | * Button: only enable mnemonic if button itself is enabled.Mitch Curtis2015-09-071-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise users can trigger shortcuts even when buttons are disabled. Change-Id: If97c6a3c3df574a4271c53cf7bcfd8fdb1a059d6 Task-number: QTBUG-48144 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | Menu: Schedule popup deletion when it's about to hideGabriel de Dietrich2015-09-111-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to serious memory/OpenGL context leaks on Windows. No such thing has been noticed on Linux which may hint to differences in the backend. Task-number: QTBUG-47682 Change-Id: I274ed98db348ffe2c78707f2c92b812f272c2723 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-253-13/+67
|\ \ \ | |/ / | | | | | | Change-Id: Id85e82801b77faf9a32177838025696aab64f002
View Lorry Controller Status