aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quickcontrols2/styleimports
Commit message (Collapse)AuthorAgeFilesLines
* Restructure tst_styleimports.cpp testMitch Curtis2022-05-0712-26/+13
| | | | | | | | | | | | | | | | | - Move all styles into a "styles" folder. This makes it much easier to understand the directory structure, as QML files loaded directly by the tests are now separated from the styles themselves. - Remove "data" test. I don't remember what this was supposed to test, as the only difference between it and the other file system-based styles is that it's in the root data directory. We can safely consolidate its controls into FileSystemStyle and not lose any test coverage. Change-Id: Ib3426f0da4619786c3aaf75f752e5b0b0a3964a6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 4b6bd49f159d01417b28c4c83ca46eda44428e59) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add file selector for custom styles when using run-time style selectionMitch Curtis2022-05-074-0/+97
| | | | | | | | | | | | | | | | | | | | | | Previously this was only available for QQuickStylePlugin-based styles. This patch makes it available for qmldir-based styles when using run-time style selection. The existing documentation doesn't differentiate between built-in styles and custom styles: "Qt Quick Controls extends the built-in selectors with the name (lowercase) of the style that an application is running with." So this is a bug fix. Change-Id: Ib2ed56ad8398db49d192db6a6023d776caaa4457 Fixes: QTBUG-99117 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit fdd62a5b81d5c3de423118bb24d5ac18a7fddbe5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unused ResourceStyle test folderMitch Curtis2022-05-071-4/+0
| | | | | | | Change-Id: Ic86e8c655a4432f2dc41b1e2f770487ff213c278 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 1c4c5aac6a1418bb40d868a3c48f647dc1a21d13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix license of tests from LGPL3 to GPL-EXCEPTKai Köhne2021-11-291-17/+9
| | | | | | | | | | | | Autotests in Qt are usually GPL3, or BSD. No point in using the LGPL here. This also gets rid of last references to LICENSE.LGPLv3 in this repository, so we can delete both LICENSE.LGPLv3 and LICENSE.GPLv3, which it references. Change-Id: Idbdefe0c68cc8047ede72b439a4d7ff40dfd71b6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix tst_StyleImports::platformSelectors() for AndroidAssam Boudjelthia2021-11-191-1/+1
| | | | | | | | | Handle the case of Android since Q_OS_LINUX is defined also on Android. Pick-to: 6.2 Task-number: QTBUG-88846 Change-Id: Iec5c286ead43141906f18349629ddffbc644072c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Consolidate test helpers into private librariesMitch Curtis2021-09-132-5/+11
| | | | | | | | | | | | | | | | | | | | Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix test pathsMitch Curtis2021-07-261-1/+1
| | | | | | | | | | In preparation for merging into qtdeclarative Task-number: QTBUG-95173 Change-Id: I0c91c9af85ca63ca8c7f7184d41f299030e12a0e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Restructure tests in preparation for merging into qtdeclarativeMitch Curtis2021-07-2217-0/+435
Task-number: QTBUG-95173 Change-Id: I541dc26cf2cdd6f2640824f693f7d059445367d9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>