Commit Graph

46 Commits

Author SHA1 Message Date
Robert Löhning
db492c461c SquishTests: Log found shortcut in tst_HELP02
Change-Id: I144dc9961d97968d3b0355487714d287d22abb71
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-04-18 09:32:52 +00:00
Christian Stenger
5b870f101e SquishTests: Adapt key sequence
The key sequence used by the test can interfere with other shortcuts
or special handling provided by the OS itself (e.g. Ctrl+Alt can be
understood as AltGr on Windows and treated differently).
Current approach modifies the detected key on Win11, so move over to
another key sequence which may likely be usable cross platform for
some time.

Change-Id: I33e981215ef09fc62c4c2913b3a72b43f39f8684
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-04-08 04:31:36 +00:00
Robert Löhning
a521114519 SquishTests: Don't initialize an entire list for reading one item
The point of Python3 returning objects instead of lists is that
it will iterate just as far as items are actually being used.

Change-Id: If4d9742bb47aa9cac1166a0ff6f10d211829fd85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-27 11:41:40 +00:00
Christian Stenger
d53a743262 SquishTests: Fix used short cut on macOS
Modify used short cut on macOS again. This tends to break
depending on OS version, underlying keyboard layout and
maybe even more causes.

Change-Id: I79b0e281128b8f779307782038aa9fb42510b633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-20 08:14:29 +00:00
Robert Löhning
012f67baf1 SquishTests: Update keyboard shortcut GroupBox
Change-Id: I168e6128f61b6363253c5ed999a29b1f64441cff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 11:16:29 +00:00
Robert Löhning
a32e720692 SquishTests: Some more Python3 adaption
Change-Id: Iee0fd4107c3423d72a1dc51b0087837e4de46537
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-09 08:28:29 +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
1c25a48393 Squish: Update getQtCreatorVersionFromFile()
Change-Id: I9ca74e66c71b363604c6ea1467b2d1ccdffb45f5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 10:24:14 +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
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
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
e9a78b13b3 Squish: Remove exec permission where not needed
These python scripts cannot be executed directly anyway.

Change-Id: I9ac3170450c4f8be4063b02ee8ec9df28f90cec5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-03 11:26:08 +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
c8b176c9a7 Squish: Stabilize tst_HELP02
On Windows, the shortcut gets lost when
clicking "Stop Recording" too quickly.

Change-Id: Ieb89b7f59ded0792bf09fbad0b4b44a78d369c0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 09:25:31 +00:00
Robert Loehning
d35cf4b846 Squish: Stabilize tst_HELP02
Depending on the sizes of the treeview and its contents, the
click might hit the scroll bar and result in a script error.

Change-Id: Ic3658b1f180d1aa5a792d6664d2d7f56d8d0c353
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 10:48:25 +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
29668d633e Squish: Update tst_HELP02
Change-Id: Ia45e06bbf6df2e8b80f42824bc1b8bff34843538
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 10:15:57 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-05 09:24:18 +00:00
Robert Loehning
5ca3f52b4b Squish: Fix property name
...to the correct capitalization. Squish < 6.3 could
handle both, whereas Squish >= 6.3 is more strict.

Change-Id: I9864518e21d3f2ed44fe7527f75aa958dc0081de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-12 09:19:02 +00:00
Christian Stenger
e45f4af3d4 Squish: Work around Squish issue on macOS if necessary
Change-Id: Ib6a6179ba51a907ee5e7aa1a6e30f345da217e52
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-07 11:02:09 +00:00
Robert Loehning
47198b44e4 Squish: Exclude HTML when reading version from dialog
Change-Id: I2e73a27aaa3b8c28cdce93576a8cdfc861e37b8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-12 11:30:14 +00:00
Robert Loehning
4ea64b902e Squish: Update tst_HELP02 to use QTCREATOR_DISPLAY_VERSION
Change-Id: I7cffa591f036ea7ff1803a49a605030612dd787b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-02 10:31:24 +00:00
Robert Loehning
8c8ed3294f Squish: Raise timeout for help content
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-18 08:43:45 +00:00
Robert Loehning
990e2a83ca Squish: Fix tst_HELP02
We don't just need any items in the model,
we need an item that passes the filter.

Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-17 13:11:31 +00:00
Christian Stenger
1914329ec2 Squish: Fix tst_HELP02
Content of the QHelpContentWidget gets populated asynchronously,
so wait a bit to have at least one entry - which normally should
be our own documentation.

Change-Id: Iad78f0bab0dd7f2f5a83cd94d2b2830ba146f554
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:36:55 +00:00
Christian Stenger
dbfa9280b0 Squish: Fix assigning shortcut
Change-Id: I32d563a198ec1e56b86e97f6803dd2e15f1bd565
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-13 11:26:43 +00:00
Christian Stenger
53770ebaa5 Squish: Add some verbosity to figure out what might be wrong
tst_HELP02 is consistently failing if running from inside Jenkins,
but passes when executed locally.

Change-Id: I70fe9b7dc74dbf82f102b5670ddf04bf0dbfa270
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-12 12:40:49 +00:00
Robert Loehning
30541d0213 Squish: Don't expect fail anymore in HELP02
Change-Id: Iba979f099b31a35693d0fee49de86fe6b8b3c55c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-04-07 09:33:00 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 16:01:06 +00:00
Robert Loehning
0352e54253 Fix copyright headers in Python files
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 16:52:03 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Robert Loehning
335ada73c4 Squish: Expect missing manual
Change-Id: I296d492ea79512ac73dfec4d86743b1203ee9631
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 14:52:12 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Christian Stenger
a966e33308 Squish: Remove unnecessary imports
Change-Id: Ia902e0a797fea947f83505f6b09e3efed24f65b1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-04-30 08:09:12 +02:00
Christian Stenger
aff40bd187 Squish: Provide fallback for tst_HELP02...
...when running on build machine inside Jenkins.

Change-Id: I184ff013b1743b9f50cd0a2ac0ef76071b4336a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-21 16:20:33 +01:00
Christian Stenger
d1b412ced2 Squish: Add workaround for tst_HELP02
Change-Id: I61307ccd86246cdbe131f89e13521be8942c22a1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-19 17:05:07 +01:00
Christian Stenger
c3a23cb862 Squish: Rewrite checkQtCreatorHelpVersion()
Change-Id: I994379476ab52df75a4a34a8e0db025ee2f3df70
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-14 08:02:52 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Robert Loehning
6ac27c9635 Squish: More output from HELP02 to investigate fails on Linux 64
Change-Id: I5bb7290970039e8629ec8aae7115c850874654c1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-22 16:43:01 +02:00
Christian Stenger
7eb4b14370 Squish: Extend version test to manual
Change-Id: Ia8b70c9769fc36f82170e93a751cac4bd124f997
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-25 13:50:43 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-15 13:35:01 +02:00
Christian Stenger
cc765472d2 Squish: Use readFile() if possible
Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-06 12:35:20 +02:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-22 16:52:13 +01:00
Robert Loehning
1f9e226e77 Squish: Closing file after reading
Change-Id: I69f53c7626bbdb14874d0e5d459fa0ac346d40a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-29 11:03:21 +01:00
Christian Stenger
7f98c517e1 Squish: Use global objects.map from inside HELP
Change-Id: I3df21777eb06e002de318c094741e3ff878a5f17
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-12 14:08:44 +02:00
Jan Kerekes
23c7665cc5 Squish: Added new test cases/suite for help functionality
initial commit

Change-Id: I20aae999dec164a29e40c2926e36c015526c17cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-06-12 19:00:24 +02:00