Commit Graph

353 Commits

Author SHA1 Message Date
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
Robert Loehning 43454c3fcd Squish: Update expected tree for qbs
Change-Id: I3ba303f0206db193d3e00ce52ac20f516823881c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 09:14:08 +00:00
Robert Loehning 3837cdac2b Squish: Ignore two fails in tst_rename_file
Neither can I reproduce them without Squish, nor are
they clearly inside the scope which needs testing.

Change-Id: I25494de34cd216678913fbf04dca88c3c0126ed9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 10:04:59 +00:00
Robert Loehning 38d4ccbdcb Squish: Fix and update tst_rename_file
Change-Id: Idc8134dd0df5df530285525783532c21014087a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-15 17:15:15 +00:00
Christian Stenger a51a4f7915 Squish: Fix expected object properties
Change-Id: I7f2e3ef4559fac83d17a06a231036be45f9e63bb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-19 13:11:15 +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
Eike Ziller 5c121d5791 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
2020-02-05 11:59:35 +01:00
Christian Stenger 1a86b68809 Squish: Fix test for session handling
Wait for project parsing on re-opening a session
that contains projects before trying to interact.

Change-Id: I631ee72573e1ff1fb115825aaf756489d02f18ab
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 12:04:23 +00:00
Christian Stenger bae6e3f854 Squish: Fix test for project wizard
Skip Qt Creator Plugin template as it needs special
handling on the details page.

Change-Id: If2fbba31435d280bd99d78a929dfd057ea26feab
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:34:20 +00:00
Christian Stenger dae4231e52 Squish: Adapt to changed UI
Change-Id: I8506d099dc0c0721e61d00af2abb1e4515cda38e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:34:11 +00:00
Christian Stenger 9a1135776d Squish: Adapt to changed build menu entries
Change-Id: I0b9ceb8024e42960a2b915ed5e59ae5d33fa4207
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-29 06:12:29 +00:00
Christian Stenger 51cc14c738 Squish: Close Link with Qt banner at startup
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 14:38:24 +00:00
Robert Loehning 5a05c78647 Squish: Skip Python projects in tst_create_proj_wizard
Change-Id: I82cd203a17391715428041e64b381379ab34da9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-22 11:54:10 +00:00
Robert Loehning 68fbd15299 Squish: Remove old hack for the Mac
Change-Id: I8655b8fe5a1a448995a3798fd587a01919129434
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-21 10:20:07 +00:00
Robert Loehning d9a26acbb8 Squish: Don't change suffix .qrc when testing renaming
...since it's not expected to work anyway.

Task-number: QTCREATORBUG-23167
Change-Id: I165dbcbc206372475a8d9128b1888b38b9f82367
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-18 12:40:03 +00:00
Christian Stenger 5311f8c20f Squish: Fix compiler detection
Find clang and clang++ in more than one location. If they could
be found in more than a single path provided inside PATH we
expected only the first occurrence.

Change-Id: Ibcd7b7b6dff1153fd4b52b055c0fb2a0c5d9d7fc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-12-04 06:28:45 +00:00
Christian Stenger 811db1129c Squish: Remove outdated check
Parsing nowadays starts only after selecting a kit.

Change-Id: I2beced906073f3041e9dcb021ac6ef5f03f144a5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-12-03 05:46:16 +00:00
Robert Loehning 4a17ac7760 Squish: Update tst_rename_file
Change-Id: I1b7e8ef7c112e01ed2403c348234a482b050cf49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-20 16:04:03 +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
Robert Loehning 4f2f86b5bf Squish: Skip testing Qt Quick 2 Extension Plugin wizard
We're not doing anything in it anyway.

Change-Id: I5d790d98c8952e6167bfe241af5490cf18622890
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-29 12:36:43 +00:00
Christian Stenger 99deb21b7a Squish: Adapt verification of kits
Kits are nowadays displayed if configured, but disabled
if they do not fit for the respective project.

Change-Id: If04a20afde2fc1ada643e45d5eea33e6ace7a4f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-24 09:37:12 +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
Robert Loehning e425d88b6b Squish: Update clang detection in tst_default_settings
Change-Id: Ia1e0332253a309eae9579fff5cae2659a6089c50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:29:05 +00:00
Robert Loehning 4cfcdc65a5 Squish: Use parameters in another call to mouseClick(...)
Reverts e8727fcae2 for this line.

Change-Id: I6ac752985fb9bcb66a38d7f97d8cc8dc33da4189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:28:43 +00:00
Robert Loehning 1ac8927665 Squish: Update tst_openqt_creator
Change-Id: I2fed662652f7f8f5cbe4b281bdde5791ea57e2d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-29 10:16:33 +00:00
Robert Loehning 2ad475a4f5 Squish: Update expected trees
Change-Id: I4962634155ba37780781bbd2b0f25f1d2be2a7ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-29 09:21:24 +00:00
Robert Loehning 355e4b2018 Squish: Stabilize tst_rename_file
Sometimes, progress bars "Scanning for Tests" show up,
making it unreliable to wait for progress bars only.

Change-Id: I4167d14a6d6cf4bb6ff14223f0be498c92913bd6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-26 14:57:23 +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 fd3363a2f8 Squish: Update tst_create_proj_wizard
Change-Id: I59b4829abd0d98cbf346e68e3d634da87b3a635e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-23 14:08:11 +00:00
Robert Loehning f03989c09f Squish: Update tst_installed_languages
Change-Id: I5b9fb407f75792a771877bfc14e95ac897f58b31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-23 10:59:05 +00:00
Robert Loehning d27f7c675e ProjectExplorer: Make varsBatCombos Squish-testable again
Change-Id: I4656800f80022652f9277029c597754c9263bf66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-24 15:47:28 +00:00
Eike Ziller 3acbd6032f Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: Id3bd5794a6821855c41567e8de3898d94a896ceb
2019-06-21 10:50:26 +02:00