Commit Graph

246 Commits

Author SHA1 Message Date
Christian Stenger
3a7ab3ce8e SquishTests: Rename helper class
Change-Id: I39890cbd98b7e6ebcc0fdf4722d0311eb6650397
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-23 12:50:56 +00:00
Christian Stenger
15ca3268ad SquishTests: Provide Qt6.2 for testing
Long overdue. Adapt Qt Quick related stuff as this nowadays
is requiring Qt6.2 as a minimum.

Change-Id: Id1e727813034044edb4584c6d5f73a56310293d2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-16 14:07:44 +00:00
Robert Loehning
15841807d5 SquishTests: Update createNewQtQuickApplication()
Change-Id: I4b5171b73e69d3b9d4b3acb1108df363220b6068
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-09 09:48:56 +00:00
Eike Ziller
d278135497 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I8d73198561f6ff7877d580681ca2a0018b7dc3b1
2023-02-06 10:14:18 +01:00
Robert Loehning
1d6d01952b SquishTests: Fix tst_cmake_speedcrunch
Change-Id: I76b199a7e1f2e92b78b42ee08342a95bdf385950
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-02 08:35:17 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Robert Löhning
fcb79ee810 Git: VcsBase: Squish: Make tst_git_local run again
Amends 1548eef10b
Amends 69f4cb86dd
Amends 9ad5c4254d
Amends e070d826e5

Change-Id: I584b1b9b662144899d0292b887e8cb3386f80d4b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-07 08:33:12 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Robert Löhning
9d5512b137 Squish: Retire Qt4
It can't be built with current compilers anymore and there
are no more binary packages publicly available.

Change-Id: I906789bbcca053690f39246ff7c3e602703ada37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-11 12:10:06 +00:00
Christian Stenger
fcddfe5a8c Squish: Fix project wizard test
Change-Id: Iabf4463ac535cab025db3ee808e61f5fe7054095
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:08 +00:00
Christian Stenger
a42b63ac05 Squish: Build speedcrunch with Qt5
Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-17 05:27:13 +00:00
Christian Stenger
2907d60973 Squish: Handle build systems more appropriately
Change-Id: I43e89d76c4199a741a5606dd0d6de2165b8133c6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-16 05:18:10 +00:00
Robert Löhning
82534fc979 Squish: Explicitly use qmake-based projects in suite_APTW
Creator's default build system is CMake now which broke the tests.

Change-Id: I901b44dd4545a297d0100da5d92aa1bea79e41d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 08:24:20 +00:00
Christian Stenger
3ae6f41c3f Squish: Adapt to changed UI
Change-Id: Ie25ba8a72b7fd93f60f04303ed223e7cdf2406af
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-24 14:04:51 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00
Christian Stenger
40caa8a4ba Squish: Make presence of Qt4 optional
It is hard to build Qt4 nowadays. Any machine set up
today won't be able to build it without hazzle.
So, make it optional inside the Squish tests to avoid
fails and fatals. Use a different available Qt instead.

Change-Id: I151d809f4fada8047a30940a183f913af2a1a691
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-02 11:09:12 +00:00
Robert Löhning
3eef024960 Squish: Fix checks in __selectQtVersionDesktop__
The expected checkboxes only matched what Creator displays for
qmake-based projects. This crashes since some project use CMake
by default.

Change-Id: I4d52ee6d71f332b5e884bdd87b94f9d9bacd9d19
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-12-10 12:44:49 +00:00
Christian Stenger
8039aa9ddb Squish: Adapt to changed UI
New File and New Project are nowadays separate menu entries.

Change-Id: I36c619d5a2eb4b5ac36bb25a20a1cb62f33493bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-12-09 12:10:26 +00:00
Robert Löhning
c4ba0c2021 Squish: Update for running suite_CSUP
Change-Id: I2773f98af0a6656fcf1362b4dcd2d853cc2aea81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-27 18:47:04 +00:00
Robert Löhning
765e6d2856 Squish: Remove redundant search criteria for named object
Change-Id: I8d6432f479381c7a517b8aeaeb29f76da03f4ae2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:13 +00:00
Robert Löhning
aec25d293b Squish: Use regex instead of wildcard to find objects
Squish 6.7.1 for Qt 6.1.x can't find the objects when using wildcards. The
same version of Squish for Qt 5.15.x works fine.

Change-Id: Ia378934af51cab2894a9df01e2391dbdb9cf32f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:22:57 +00:00
Robert Löhning
b543ed4068 Squish: Raise minimum Qt version for Qt Quick apps
5.12 is the lowest available version in the wizards now.

Change-Id: Ib8de3470188316b01ff521d6e66162baaa8db0af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-05 09:08:51 +00:00
Robert Loehning
38efee1598 Squish: Update __getSupportedPlatforms__()
Change-Id: Ia9840c74528c8fb435099ccdffb2f6f1b06b7e77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-07 12:48:40 +00:00
Christian Stenger
7c669a06be Squish: Adapt to changed ui
Change-Id: Ibad3b2080040f7345125c549527f22f2c246fbef
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-06-11 13:44:24 +00:00
Robert Loehning
aac77eecb9 Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 15:59:08 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Robert Loehning
72def2c625 Squish: Wait for project parsing after creating projects
There is a new progress bar titled "Updating Locator Caches". The
unspecific progressBarWait() will continue after that disappeared.
Project parsing did not even start then.

Change-Id: Iaa6b7c63ea5669aefa3f34329d8d6e4958ae4eab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-29 14:31:28 +00:00
Christian Stenger
3573b2db7f Squish: Fix wizard template categories
Change-Id: Ifb26430c429dc41ea73789a210f93b80e0e8d3f2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 12:07:33 +00:00
Christian Stenger
ebcde98b72 Squish: Re-enable testing Qt Quick 2 Extension Plugin wizard
This effectively reverts commit 4f2f86b5bf.
Additionally fixes the expected kits for this template.

Change-Id: Ie90f113894d331fa4023b8c58f30da5c4886c76d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 16:01:51 +00:00
Christian Stenger
a08a5499e9 Squish: Fix expected ui elements and page order
The wizard had been transformed to use the
JsonWizard nowadays.
Order of wizard pages has slightly changed to be
consistent with the rest of the wizards.

Change-Id: I841349d3b20dbc03a56a3dc4d15f717d0d21acdb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 15:48:33 +00:00
Robert Loehning
775c78eca8 Squish: Stabilize selectBuildConfig(...)
Change-Id: Iba111e8cbbe652dd488b4dc91c58b92f53eccba3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-15 12:46:13 +00:00
Robert Loehning
cf3772ca77 Squish: Update testing ProjectWelcomePage
Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 05:42:53 +00:00
Christian Stenger
cc67ad8736 Squish: Adapt handling for project creation
Some templates got an additional page for handling translations.

Change-Id: I420e4f1bd8be5a30056220abd73b3f9da44d5047
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-21 09:34:20 +00:00
Christian Stenger
17f5e19399 Squish: Stabilize tests that rely on a parsed project
As more and more progress bars might be present for different
purposes and we are not able to easily distinguish them
we need to use a more reliable way to wait for the end of
parsing a project.
Add a respective function and use the new approach where
this appears to be appropriate or necessary.

Change-Id: I20e2b9b0efd4785f8f0b1ddbc8496be111628669
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-01 06:11:42 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-07-25 12:06:05 +00:00
Robert Loehning
c1a83b2a88 Squish: Update lib creation
Fixes tst_APTW03

Change-Id: Ifa1bcf5334773b68b8b0027ca03a016d5ba92cb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-24 11:58:32 +00:00
Robert Loehning
38685de894 Squish: Update openCmakeProject
Change-Id: I17f1a271eafbcff24987fbd7e31dc6cc8c789b84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-26 06:58:32 +00:00
Robert Loehning
d1d7a488d9 Squish: Update GuiAppWizardDialog
Change-Id: Icdcab66e4d3a231286607a32ba8ce66d47741442
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-25 10:48:21 +00:00
Robert Loehning
9956d8d461 Squish: Update tst_qtquick_creation
Task-number: QTCREATORBUG-20056
Change-Id: I5a7e239b9c65b32e2bc57dd594cc96bdda94b472
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-20 16:30:38 +00:00
Robert Loehning
97ae2d1ac0 Squish: Fix and update tst_qtquick_creation3
Task-number: QTCREATORBUG-20056
Change-Id: I8b0980e423c2bf8921f615d04769d91c7e660dd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-08 13:14:02 +00:00
Christian Stenger
2330103aba Squish: Update wizard handling for Qml UI prototype
Change-Id: Idb4a8e445f0cc0c749298a4bd86020377b8baeb4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-08 05:18:08 +00:00
Robert Loehning
21bcc7f38b Squish: Use sets instead of lists for kits in use
They fit our use-case much better.

Task-number: QTCREATORBUG-20874
Change-Id: Ifa06ce00f3e6999a99c3bc2bb7e9ba759fa02e94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-17 12:58:14 +00:00
Robert Loehning
94fb8efab1 Squish: Remove old default target parameters
Change-Id: I72153c535ae0670cb4bfa061f34659bc7faee001
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-10 09:35:17 +00:00
Robert Loehning
59f124eb07 Squish: Fix checking for Profile mode
Amends 2a274728c2.

Change-Id: Id686e031658ad737eaeeffabe857452cc8a0d7ac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-09 10:47:18 +00:00
Robert Loehning
2a274728c2 Squish: Also check for "Profile" config being checked
Change-Id: I9f6598144b81240c4a92abb7e71b7c4cbf6baa4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-07 09:25:22 +00:00
Robert Loehning
2c6a57be9c Squish: Move imports of "os", "re" and "sys" into shared class
Change-Id: I349cb255b8fa6f96e32d5dacb3c9b58ddeb76897
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-07 09:25:05 +00:00
Robert Loehning
e8acb75115 Squish: Refactor selecting configured Kits in project
The design of the Projects mode changed several times. We wrote lots of
workarounds to keep even more old code alive because we never had the time
for a proper refactoring. This time is now.

Leads to more stable code with far less variables flying around.

Task-number: QTCREATORBUG-20265
Change-Id: I29e5956ea3279cdb1d6da61bf5b461666de436bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-02 11:48:14 +00:00
Christian Stenger
3f97874ca1 Squish: Fix tests after revert
The patch that removed Qt4 completely from the widget app wizard
has been reverted.
Adjusting the tests now.

Change-Id: I0af1eb2102caa22022658d1189794c7757c7628f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-07-27 08:40:08 +00:00
Christian Stenger
2801372d46 Squish: Fix expected targets for widget app wizard
Reverts cd45ce5f39.

Change-Id: I6865e6c91fd961ac36da160a01c676f5274c40cc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-29 05:17:55 +00:00
Christian Stenger
cd45ce5f39 Squish: Remove Qt4 from expected kits for widget application wizard
Change-Id: I747b47a5adb684f9ef3c245427707ead9ffba20a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-26 14:21:19 +00:00