Commit Graph

385 Commits

Author SHA1 Message Date
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
94c9e6cbac SquishTests: Add possible location of cdb
Change-Id: I72c3f1b5bdcceeca2764d4a77229c45655187376
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-21 11:44:20 +00:00
Christian Stenger
cf8f23e8e0 SquishTests: Fix wrong usage
Amends 476f67cce5.

Change-Id: I584a059b52515bf625a973fff43485f5b52e6061
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-04-14 05:06:28 +00:00
Robert Löhning
5c5e12981e SquishTests: Add an explanation about automatically created kits
Change-Id: I1bb351c56600fa4a6e420299bdbaff1c436d19c9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 09:23:39 +00:00
Christian Stenger
0c6b3b3747 Squish: Fix expected compilers on Windows
Compilers will be nowadays displayed with full version.
VS 2019 and 2022 are out for a long time and have been added.
Ensure installed official LLVM is detected correctly.

Change-Id: Ica29dca74cb8e08bafda1a88fcd2c2a6150bb236
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-31 06:12:49 +00:00
Christian Stenger
3ad00fc871 SquishTests: More Python3 adaption
Change-Id: I95488e2b5661c8790cb73246947af58de2a1899b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-29 15:17:24 +00:00
Christian Stenger
ac4aaf5e23 SquishTests: Some Python3 adaption
Makes some tests succeed and lets a couple of tests get further
on macOS.

Change-Id: I9a3f124c094e67f51748ddae47d00897fe5259d5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-27 04:36:30 +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
2d79718ad4 SquishTests: Adapt to changed wizard template
Change-Id: I7e487481ede88d186fb868d595eb96f25afc2fc5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-21 06:23:43 +00:00
Christian Stenger
5c7eb717ed SquishTests: Adapt to changed wizard
Change-Id: I07d3b468e6b5ec4055fa57efcddaa0cdb678966b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-21 06:23:14 +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
Christian Stenger
476f67cce5 SquishTests: Fix default settings test
Depending on the presence of the llvm that had been used when building
QC we need to expect its clang.
Use special environment variable to be able to do this correctly.

Change-Id: I2497bbd96483f37aa90842d7fffa5d0a8103ff45
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-01 14:42:05 +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
80885d12e0 SquishTests: Update tst_installed_languages
Change-Id: Ic06b6241df913ebcfe685936f3c509875a2897bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-15 06:45:00 +00:00
Robert Löhning
c72a93599d Squish-Tests: Use QTC_DO_NOT_PROPAGATE_LD_PRELOAD
This is a reaction to an change in Creator's handling
of environment variables. Creator now passes on
LD_PRELOAD set by Squish. This results in build errors
and crashes of started applications.

Change-Id: I39cf21c60a474d7453e9c29fd3eaf32d3f0d6806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 19:20:07 +00:00
Robert Löhning
2acc90a0ba SquishTests: Update tst_create_proj_wizard
Change-Id: I652f2504d1e13ae8c93429a99d31d3754bd57298
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:04:00 +00:00
Robert Löhning
86f87605f9 SessionDialog: SquishTests: Update tst_session_handling
Change-Id: I6fcdb6173c39715e85f4cf37d12e7707b2e5d066
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 10:03:22 +00:00
Christian Stenger
9f0dcd71c4 Squish: Adapt to ui changes
Change-Id: Ie7cb2a80a5edfa135a1b5d1b44c365a5e6cf408b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-10-13 13:08:05 +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
Christian Stenger
450f4abe74 Squish: Adapt to changed ui
...and modified minimum requirements inside wizards.

Change-Id: I32d2dea0dc0ccff273ebf32f5aa713829330eb01
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:51:21 +00:00
Christian Stenger
7103432404 Squish: Do not expect clang shipped by QC anymore
Change-Id: I2f09835bde52aa2f0cd90def7f6d8d628736ff56
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:03:11 +00:00
Robert Löhning
0c2e1cf094 Squish: Update location of Options dialog
Change-Id: Ie9df4f897621520744998c3dbd9a3c44600ba844
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-28 10:13:34 +00:00
Robert Löhning
90bde92efd Squish: Align iterateKits() better with the way we use it
Change-Id: Ib41b4e763b0df8a74fd7b073710b29640fea17db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-09 15:03:23 +00:00
Robert Löhning
02742670d3 Squish: Reduce complexity of iterateQtVersions()
By removing dead code, code which generated unused data,
unneeded generality and needless abstractions.

Change-Id: Ie271363c5446ef02f32e48a78db3d8ef9be0ed29
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-09 15:03:07 +00:00
Robert Löhning
ef52fa743b Squish: Fix tst_cmake_speedcrunch for Python3
Change-Id: Ide963d0ee27ff14fdd3d5f4f2bd4dd7b94254521
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-04-13 11:41:17 +00:00
Robert Löhning
e4463ba6d4 Squish: Port tst_create_proj_wizard to Python3
While staying compatible with Python2.

Change-Id: I1de16a4a066b00bc11b4142e144d7b9246f7c14c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-04-12 20:59:28 +00:00
Christian Stenger
c1b585933b Squish: Fix remove kits test
cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.

Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:16 +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
Robert Löhning
a2735ec024 Squish: Don't configure projects on Qt4 anymore
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 18:27:32 +00:00
Robert Löhning
ab772c50be Squish: Update tst_cmake_speedcrunch
Change-Id: I46ab6f245a21546e6ebf20680f06b0cdd26eab8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-17 21:35:44 +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
Robert Löhning
00c7161e33 Squish: Run tst_save_before_build on CMake and qmake
Change-Id: I91501633e0fe7c863c43af4224474c09f57dbf8c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-18 22:01:14 +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
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
2022-02-02 10:17:03 +01:00
Robert Löhning
7a8ca55f77 Squish: Introduce helper function for checking for strings
In Python3 type unicode is unavailable since it's implicit with "str".
The new functions helps porting code.

Change-Id: I5de0fa182acbbaf267ed51f66f658cb9c884f4c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 11:00:35 +00:00
The Qt Project
03a0e6211d Merge "Merge remote-tracking branch 'origin/6.0'" 2021-12-09 13:19:14 +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
Christian Stenger
1f12b3444e Squish: Adapt to removed wizard templates
Change-Id: I56b0bd7000fdc73cce759ca743da543ecc715453
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-12-08 13:20:50 +00:00
Robert Löhning
cbc9f4c4e1 Squish: Stabilize tst_rename_file
It takes a moment until the changed file appears in the project tree. A
context menu opened in that time may be in an unexpected state, so wait
until the renaming finished properly.

Change-Id: I6e1941083737b2df5855b9b0e61a973c99831304
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-07 08:56:06 +00:00
Robert Löhning
47cb2e9d24 Squish: Update and stabilize tst_rename_file
Change-Id: I1dae24e20d8c65b716dd988812eee013f0491603
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-07 08:55:50 +00:00
Robert Löhning
a1eb505fbd Squish: Use Qt 5.14 in tst_openqtcreator_qbs
Change-Id: If214c32a0a62ebdada455a325ad1b2d02adc67c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-16 07:17:37 +00:00
Robert Löhning
5c2b00aaf7 Squish: Update tst_build_speedcrunch
Change-Id: Ie3ea3a06f36a540e1e96ed288af46e5e69e47997
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 18:49:04 +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
Christian Stenger
ebad39d100 Squish: Fix expectations
The Qt version is nowadays newer than the version that may
trigger this warning.
And the warning will most likely no more open General Messages
by default.

Change-Id: Iabb6b7e1775044917239e1fde67d44fd1c8ff326
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-04-21 13:12:00 +00:00
Eike Ziller
62011851ae Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: Ie467c5d63420041a9acffeb4a726130988ec0f41
2021-03-18 09:29:51 +01:00
Christian Stenger
da53e3f994 Squish: Allow automatically created kits
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:11:26 +00:00
Robert Löhning
2ec094b419 Squish: Prepare for clang > 9
Change-Id: I4cf6e8be63568d56388b0cf87ae692735bf4c113
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-15 09:53:55 +00:00
Christian Stenger
cf9cdd2a36 Squish: Update tst_cmake_speedcrunch
Server mode has been dropped.

Change-Id: I356f814bb4b0084cfcecd3b92ede1a0c27daf2b4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-08-17 17:52:55 +00:00
Robert Loehning
c9355626d5 Squish: Update expected tree for qbs
Change-Id: Ib2fd3ec1df0772de2ae2ef7c4083431ccd32095b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-16 14:17:53 +00:00