aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qquickfolderlistmodel
Commit message (Collapse)AuthorAgeFilesLines
* Make the nameFilters test resilient to file system changesVolker Hilsheimer2021-01-262-4/+4
| | | | | | | | | | | | | | | | | | | | The test failed reliably when the directory in which the test started had the same number of files as the directory that the test wants to read. That's because the QTRY_COMPARE matches immediately and doesn't process events, which leaves queued signal emissions pending. So, count tests passed - for the wrong reason - and follow up tests failed. To make the test robust, start with an invalid directory, which we know is empty. Once switching into the test directroy, the test will have to process events. Remove the BLACKLIST file. Fixes: QTBUG-90468 Change-Id: I9b3c4dc1a15b0b5ab6c632c12752b038164b9d9d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist tst_qquickfolderlistmodel::nameFilters on macOsFabian Kosmale2021-01-201-0/+1
| | | | | | Task-number: QTBUG-90468 Change-Id: I9e6ec2a218ba09ef9819eddcd00d090a79cbc6ca Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove the qmake project filesFabian Kosmale2021-01-151-13/+0
| | | | | | | | | Remove all qmake project files, except for examples which are used to test that qmake continues to work. Change-Id: Ic4abb72dc2dcd75df7a797c56056b6b3c5fe62ac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* tst_qquickfolderlistmodel: fix error checkingMitch Curtis2020-10-221-33/+14
| | | | | | | | | QTest macros don't prevent further execution when used outside of the test function, so the rest of these tests would still execute even if checkNoErrors() found errors. Change-Id: If80a5d73cbfa18d5009c84bf658f40684b99d8f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-062-8/+8
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Remove winrtOliver Wolff2020-06-041-1/+0
| | | | | | | | | Task-number: QTBUG-84434 Change-Id: If8f57f00726868a3540c877d07fca761618e4f08 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-172-4/+4
| | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate qtdeclarativeAlexandru Croitor2020-02-122-8/+4
| | | | | | | Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-161-0/+17
|\ | | | | | | Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
| * QQmlImport: Allow importing multiple versions of the same moduleUlf Hermann2020-01-101-0/+17
| | | | | | | | | | | | | | | | | | Previously, once a plugin had been loaded, the static module registrations were disregarded. Therefore, if there were static and dynamic registrations in the same plugin, only one set was ever loaded. Change-Id: I24f52cc579a833041c51f15555caf226a6189c99 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Regenerate all projects with new CMake API versionAlexandru Croitor2019-11-152-8/+8
| | | | | | | | | | | | Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Regenerate testsAlexandru Croitor2019-11-142-24/+14
| | | | | | | | | | | | Change-Id: I67a6c8f1659e7b471a4fcb92a2699292cf4eea81 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-0/+42
|\| | | | | | | | | | | | | Removed dependencies.yaml because we don't use it yet in wip/cmake. Fixed conflict in qmlcachegen.cpp. Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
| * QQuickFolderListModel: make sure properties' values can be updateWang Chuan2019-09-111-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | There are some properties in FolderListModel neglect to update their values, although the new values are passed to the thread which does the real work [ChangeLog][QtQuick][QQuickFolderListModel] update the values of some properties when setting new values to them Fixes: QTBUG-77965 Change-Id: I77db3388cee569479459deaa2e19546a77da6178 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-1/+8
|\| | | | | | | Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
| * Fix qquickfolderlistmodel autotest on AndroidJan Arve Sæther2019-08-141-1/+8
| | | | | | | | | | | | | | | | | | | | Mostly resource path issues. It also seems to be some issues with the default folder of FolderListModel on Android. Change-Id: I8260775afd53bfe33977a9571d37009703774ae8 Task-number: QTBUG-77335 Task-number: QTBUG-73512 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Rename alias resource propertiesLeander Beernaert2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | Rename all alias resource properteis to QT_RESOURCE_ALIAS to match the latest changes in qtbase. Add special case to install_cmake since it doesn't have any cmake files in that directory. Change-Id: Icf78ed1e126daa149b62aa418fd5f7ad8579e2bc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add QtDeclarative Test CoverageLeander Beernaert2019-08-142-0/+123
|/ | | | | | | | | | | | | | | | | | | | | | All tests compile and run on a developer build. These tests are failing: tst_qqmlsqldatabase Fails due to missing sql driver tst_qqmlsqldatabase Fails in wip/qt6 tst_ququicklayouts Fails in wip/qt6 tst_flickableinterop Fails in wip/qt6 tst_qquickpinchandler Fails in wip/qt6 tst_qquickflickable Fails in wip/qt6 tst_qquickgridview Fails in wip/qt6 tst_qquickimage Fails due to missing jpeg plugin tst_qquicklistview Fails in wip/qt6 tst_qquicktext Fails in wip/qt6 tst_qquickcanvasitem Fails in wip/qt6 tst_scenegraph Fails due to missing jpeg plugin tst_TestFiltering Fails in wip/qt6 Change-Id: I4b9d69c118e23c095cb72ad5a67653fc30943bb1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Blacklist tst_qquickfolderlistmodel::nameFilters() on msvc2015/17Ulf Hermann2019-03-271-0/+3
| | | | | | Task-number: QTBUG-74739 Change-Id: Ib0f1d39cb5bc9864195b3c62d254fa38370faf0d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add sortCaseSensitive property so the sorting can ignore the caseAndy Shaw2018-10-193-7/+38
| | | | | | | Change-Id: Id308272cc59eca8c95f1386db8cd64f266124579 Fixes: QTBUG-48757 Fixes: QTBUG-70212 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* init variables where they are declared when possible (clang-tidy)Shawn Rutledge2018-02-261-3/+3
| | | | | | | | clang-tidy -p compile_commands.json $file -checks='-*,modernize-use-default-member-init,readability-redundant-member-init' -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' -header-filter='qtdeclarative' -fix Change-Id: I705f3235ff129ba68b0d8dad54a083e29fcead5f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-261-10/+10
| | | | | | | | | | | | | From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* FolderListModel: add status propertyIlya Kotov2018-01-281-0/+16
| | | | | | | | This allows to track directory loading Task-number: QTBUG-48708 Change-Id: If79a325ef1bfc831d3bc2a205e3127a571fcb0c1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Enable QML/JS disk cache by defaultSimon Hausmann2016-08-051-0/+10
| | | | | | | Except on Windows, where there is still one bug to fix. Change-Id: I1a22f42859733eedd37596a3e8fc09680720ff10 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Updated license headersJani Heikkinen2016-01-201-17/+12
| | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-141-2/+2
|\ | | | | | | Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875
| * Tests: Fix single-character string literals.Friedemann Kleint2015-10-131-2/+2
| | | | | | | | | | | | | | | | Use character literals where applicable. Change-Id: Ib0e618752fbc762a73a0a91c43efab61ef2c9687 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove CONFIG += parallel_test.Friedemann Kleint2015-09-051-1/+0
| | | | | | | | | | | | | | The keyword no longer has a meaning for the new CI. Change-Id: I699f2881e291cce02a6a608a8710638886e38daa Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.Friedemann Kleint2015-09-031-1/+0
|/ | | | | Change-Id: I691b8ddff60b5f16f06d32b379c76e87f44f84a9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* tests/qml: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).Friedemann Kleint2015-07-291-2/+2
| | | | | | | | | | | | - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I8cc97fd9b48fc789a849e9527c292c4e05accd97 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-121-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* QML: fix warning in testsErik Verbruggen2014-12-091-1/+0
| | | | | | | Remove unused constant. Change-Id: I3fb3512f7ea54102450eeeda1a56c73fe6b26025 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Introspect qrc files in FolderListModel.Gatis Paeglis2014-08-225-8/+32
| | | | | | | | | | | | And don't use "file watchers" for resource file paths, otherwise it generates the following warning: QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed: No such file or directory Change-Id: I6b75c9195fb2b2ba7b3e0bb7d146fc5cd343927e Task-number: QTBUG-40307 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* FolderListModel: pessimize change signals when the filter changesShawn Rutledge2014-03-183-11/+38
| | | | | | | | | | | FileInfoThread doesn't have separate signals for insertions, deletions and updates, so QQuickFolderListModel shouldn't make an assumption that if the list got bigger, an insertion was the only thing that happened. Task-number: QTBUG-36576 Change-Id: Ibb02d64e1645dd6df231d28a93e424aaad0effff Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix qquickfolderlistmodel test compilation on WinRTAndrew Knight2014-03-051-3/+3
| | | | | | | | Like WinCE, the changeDrive() test should be disabled on WinRT. Change-Id: I85749b84fef372e166fe52c263225478094ccdb4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-031-4/+4
| | | | | | Change-Id: I9856c110399c4b6b1ea6aba2d92392cecff04656 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* fix whitespaceOswald Buddenhagen2014-01-221-2/+2
| | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix crash in FolderListModelFabian Bumberger2013-10-172-5/+24
| | | | | | Change-Id: I8d012e9a356676dd3dad246579c7339eaddc1e91 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix tst_qquickfolderlistmodel flakiness using QSignalSpy::wait.David Faure2013-08-161-16/+9
| | | | | | | | | | | | | | | | | The signal is emitted in a thread, so creating the spy afterwards is racy (due to isSignalConnected() at the beginning of QMetaObject::activate). Creating the spy before hand fixes the race, and using QSignalSpy::wait() leads to much smaller code, in addition. Note that the call to wait() itself isn't racy, even if it happens "after" the signal emission: the signal goes via the event loop so it will always be received by the main thread within the call to wait(), never before. In addition setPath() is called once upon creation, and again via the setProperty call. If we don't wait for the initial listing to happen, we're replacing it, and then folderChanged is never emitted. Change-Id: Iab7eada2e9db8ba710f05bc3b82941c782f36467 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-061-0/+28
|\
| * Merge branch 'stable' into devSergio Ahumada2013-08-051-0/+28
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| | * FolderListModel: Do not return invalid URLs like "file:" when navigating up.Friedemann Kleint2013-07-291-0/+28
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32139 Change-Id: I715b97eb85bc4235de6a2bb696131efae56477fd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Fix race condition in tst_QQuickFolderListModel::basicPropertiesSimon Hausmann2013-08-051-1/+17
|/ / | | | | | | | | | | | | | | | | The FLM updates its contents asynchronously using a thread, so before we query for the new properties after changing the folder, make sure the thread finished updating. Change-Id: Icbd72801f639f9dffdc0dd85fbbd8b3ee53fedda Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add "showFiles" property to FolderListModelAlberto Mardegan2013-06-251-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property, if set to "false", causes the FolderListModel not to show regular files. This can be useful when someone wants to list only the directories; for instance, one can have a ListView showing only the directories (with "showDirs: true" and "showFiles: false") and another for showing the directory contents ("showFiles: true" and "showDirs: false"). Since by default this property is "true", the behavior of applications who don't use this property is unchanged. Change-Id: I6eaa9c4a6a582ea81fa07bad129a4c9b15fdcaea Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | fix Folderlistmodel "showDotAndDotDot" didn't show "."Tasuku Suzuki2013-06-102-2/+52
|/ | | | | | | Task-number: QTBUG-29858 Change-Id: Ia736776e2587601a80d0aef22bb5cfce74040d39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix tst_qqmldebugjs and tst_qquickfolderlistmodel build for WinCE.Janne Anttila2013-04-241-2/+3
| | | | | | | | | | | | | | | | | | | tst_qqmldebugjs: Some WINCE header files define IN and OUT macros, and those make the following assignments in tst_qqmldebugjs.cpp to fail later on: const char *IN = "in" const char *OUT = "out" Since platform macros are not needed in the context of this file, undef them to make build pass for WinCE. tst_qquickfolderlistmodel: WinCE does nothave drive letter concept, so lets execute the changeDrive test only on desktop Windows. Change-Id: I5c159e3b3ee82e888aeac1da559fd63a875d089e Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-011-0/+1
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I6988c2360e9d88916311374a0c910bfc5b607439 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>