Commit Graph

265 Commits

Author SHA1 Message Date
Christian Stenger
d301804992 SquishTests: Provide new settings for Windows
Change-Id: I9b7df60427c60f57f55fe3d163a0c5cea189150f
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2025-02-11 06:51:17 +00:00
Robert Löhning
43a3516ff4 SquishTests: Remove unused parameter from waitForProjectParsing()
Its last usage was removed in 14.0 because it had already stopped
working back then.

Change-Id: I672a9769261e2acff4bf55eba0f867401c1f2d1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-10-29 10:18:57 +00:00
Robert Löhning
3dd8798d84 SquishTests: Fix waiting for project parsing
The run button isn't being disabled after changes to the project
anymore. Replaced this condition with waiting for progress bars
in the only place where that mattered.

Change-Id: Ib73c2ec67479af9c7d45d30dcfdd4ed81c792b9b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-10-18 11:35:26 +00:00
Robert Löhning
a1ca3888ba SquishTests: Retire Qt 5.4 on Linux
We never used it on Mac and on Linux it doesn't provide any value. On
Windows it's still the only kit using gcc, so it should not be removed
without a replacement.

Change-Id: I330f8d33a98759a762fd5cc97d5d55e03d1d03d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-08-12 09:40:39 +00:00
Christian Stenger
facd32b2e0 SquishTests: Remove duplicate object
Change-Id: I7ceed8ef40684323b8404c3fe7c529fbd5b7be74
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-04-23 11:08:44 +00:00
Robert Löhning
00ac4b7ccc SquishTests: Fix supported platforms for Qt Quick 2 Extension Plugin
Change-Id: I3accd8f43c5cace3145aacff28ef068ff20ecea2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-04-17 09:11:21 +00:00
Robert Löhning
95df308bc3 SquishTests: Remove compatibility code for Python 2
Change-Id: Ibcf9a76fb163aa7167ad0ef0616c39b33c30d7c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:30:00 +00:00
Robert Löhning
301b06ca4c SquishTests: Make sure targets' details are collapsed after choosing
Other code expects all of them to be collapsed, but Creator 13 expands
them when checking. This change makes sure they are collapsed afterwards.
The new code is backwards compatible with the old behavior.

Change-Id: Ic698fb17f3ad1573195e7e0f7bcf722beed74ffc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-18 08:51:44 +00:00
Robert Löhning
c5cce4233d SquishTests: Update tests for Welcome screen
Some tests are failing because of QTCREATORBUG-30466
unless someone resizes Creator's windows manually.

Task-number: QTCREATORBUG-30466
Change-Id: Ibeecc2abd85839be3497691912e411862c465a89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-01 13:26:11 +00:00
Christian Stenger
1633d76b76 SquishTests: Allow designer test to progress further
Explicitly chose a newer kit as the kit we would use by default
lacks some compiler features on Windows.
This patch here only fixes the test crash when trying to access
a disabled menu item due to cmake dropping out with error when
parsing the project with the active kit.
Drive by change: removed workaround for fixed bug.

Change-Id: I783626f30d27ab1852536ae0d1f936ec8323feb8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-12-11 14:03:13 +00:00
Christian Stenger
cd5cbd64f7 SquishTests: Fix finding line edit on wizard
Change-Id: I26be629e11e2d768b3afed518cd6026028d2e17a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-27 08:43:11 +00:00
Christian Stenger
4a8c08a349 SquishTests: Skip too old Qt on Windows
When creating a command line project from wizard we end up
with code that is not compilable on Windows when using too
old Qt versions. Explicitly do not use the older Qt versions
as this fails to build and the whole tests would need to get
adapted to handle this appropriate instead.

Change-Id: Ia8a253a0c5d8d20ea181dd33dc8d31cb83cb31c3
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 10:37:50 +00:00
Robert Löhning
de104fad12 SquishTests: Don't try changing build system of Quick Apps
They can use CMake only.

Change-Id: Ibbce50290597594a98ae08d9dd7ab171137c2b7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:42:49 +00:00
Christian Stenger
b0d5e41e53 SquishTests: Fix selecting of Qt Quick version on wizard
Change-Id: I96ac34323e52507b26f7936499dade9203529315
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-02 04:38:36 +00:00
Robert Löhning
e719a2b47a SquishTests: Update tst_create_proj_wizard
Change-Id: Id17f5d1a68da7fe7c9f45dc5b62ab3fe1039f753
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-15 14:13:41 +00:00
Robert Löhning
13e0011dba SquishTests: Fix formatting of exception message
Amends 8d03220017

Change-Id: I05266fe6152a8ac2601890e8dcf32fc68d0989d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-09 08:28:51 +00:00
Robert Löhning
8d03220017 SquishTests: Improve log messages of exceptions
...and make them more similar to Squish's own "Error" messages.

Change-Id: If5df701d4fa01fc1c1aea94cc9778a6a5dccc44e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:33:01 +00:00
Robert Löhning
d86b091297 SquishTests: Further Python3 adaption
Fixing tests in suite_editors

Change-Id: I4e5e1adc2c4e6606232d76a794aff7a7144d5c9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-02 09:14:12 +00:00
Christian Stenger
5265ad275c Squish: Allow build to fail for runAndCloseApp()
Allows to mark current configuration to fail when we trigger a run
with implicit build.

Change-Id: I5738c49e62bca876c0aeba28af5f8315303620a2
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-29 15:17:02 +00:00
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