Commit Graph

1609 Commits

Author SHA1 Message Date
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
Robert Löhning
4980f71dd5 Squish: Update tests which use "Rename Symbol Under Cursor"
When using this on open files, Creator used to make the changes
but not save the file. Creator 6 now also saves the file unless
it already contained other changes. Because the file is being
saved immediately, "Save All" and "Revert to Saved" cannot be
used in this situation anymore.

Change-Id: I0b8a58d998c54ccceae6d178b2c7a6f6182c7ad0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 10:59:39 +00:00
Eike Ziller
85b60d9608 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
2021-12-16 10:50:33 +01:00
Robert Löhning
85b1d166eb Squish: Don't try saving files after refactoring
Files are being saved automatically.

Change-Id: I4a5ce9e1ddbbd6ea3c7f51d8548a31eda8de0aab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-12-10 22:11:18 +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
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
91f4559720 Squish: Don't wait for nothing in tst_simple_debug
Change-Id: I74bb40b03fa13568571f4009618c523bf9c13c63
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-01 12:39:32 +00:00
Robert Löhning
5ba3eb7fcf Squish: Update for running tst_generic_highlighter
Change-Id: I262fb7a7223e235708cbc7e8e382a2448a2f8c84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-29 13:20:00 +00:00
Robert Löhning
73405cc089 Squish: Update for running tst_APTW01
Change-Id: I95ac2d2209dbc47e316b746313e4545a1b80ab55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-29 11:23:37 +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
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
f529051b58 Squish: Be fuzzy when comparing snippet fetched from Pastebin.Com
Change-Id: If08b2b9136d55e2dddca6181c1075d845422a30b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-16 07:17:55 +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
4455dd2ece Squish: Prepare tst_WELP01 for Qt 6
Working around the wildcard issue...

Change-Id: I3d3b8e0360762ea72c39a49274df271fc0090e8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:28:25 +00:00
Robert Löhning
0824aa2ce3 Squish: Use tab visibility hack on Windows, too
Change-Id: I6e5f4b75747b703ab46e2f3776b134aff8b34ac0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:26:39 +00:00
Robert Löhning
3d20cc68e5 Squish: Update tst_memberoperator
Change-Id: I929ef6dc2db7c9efdd0c33c42aa44268595bc75d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:26:24 +00:00
Robert Löhning
f1c5c1fc03 Squish: Stabilize tst_memberoperator
Frequently wait for the editor again to avoid the
"Error in type() invocation".

Change-Id: Id8e5971e6ef8fbb8dfb59fbb971a2212557adf72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-23 09:26:17 +00:00
Robert Löhning
468b2aec2d Squish: Update tst_WELP01
The "Get Started Now" button opens a different page.

Change-Id: I99b4b492afae3d5389eabbf9f3661d3653a2460f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 11:15:21 +00:00
Robert Löhning
939fb7cb0c Squish: Fix storing breakpoint locations on Windows
Not changing Linux or Mac.

Change-Id: Idcc22c9d960ced7145b10651f75c78a740714cff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 11:15:00 +00:00
Robert Löhning
00a2dd0747 Squish: Explicitly convert analyzer data to str
With Creator built on Qt 6.2, Squish considers the
data different although the contents look the same.

Change-Id: I281b7425d5b3f9a977456253e0299f452d75c1e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:33 +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
Christian Stenger
0408b4a757 Squish: Improve Python2/Python3 compatibility
Change-Id: I49dc9ee2f4ef52900b403ed94f0c6cd5925239b6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-12 11:17:44 +00:00
Robert Löhning
e9f53752ee Squish: Update tst_codepasting
Change-Id: I7929a97dea0a362f07eff46a37d84b65fa546bbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-12 10:19:27 +00:00
Christian Stenger
bfe2a7b9d1 Squish: Fix suite_debugger
Change-Id: Ic0add36d2acfbf4c6de93d27f8651062ad9f1fb4
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-10 18:55:43 +00:00
Robert Löhning
867b006517 Squish: Update tst_APTW03
Change-Id: Id3b93b8e78b7797bd8c1cec5e6edb0b7cc966ea1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 18:49:23 +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
Christian Stenger
bd5c36530b Squish: Prefer 64bit debugger over 32bit on Windows
We nowadays build with 64bit Qt and need a matching compiler.
Especially when testing packages that ship both cdbext versions
the preference of 32bit breaks debugging.
As a drive by, fix tst_simple_debug by triggering rebuild via
locator as menu items are nowadays harder to distinguish.

Change-Id: I6f0c1083472713c48b4d558d6c6f9b8b0da2ca77
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-06 18:58:51 +00:00
Robert Löhning
2f6c5db856 Squish: Update isMsvcConfig
Change-Id: Ia2042d32d0a41a8876ba6dfae960f48bca2b298c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-06 09:29:17 +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 Löhning
140c267181 Squish: Update tst_simple_analyze
Deal with Build menu items which all look the same now.

Task-number: QTCREATORBUG-26002
Change-Id: I120f0f0b6f0ee0451636635313cff6d7bd53706b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-30 09:27:52 +00:00
Robert Löhning
60a77e64f5 Squish: Substitute tilde in Qt version settings
Creator doesn't seem to handle it anymore.

Change-Id: I9398193e1b3ceafa2bf05c2cbd85a757aaca3306
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-30 09:27:12 +00:00
Tim Jenssen
453f4996db use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.

This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.

Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-13 15:38:46 +00:00
Robert Löhning
770182653c Squish: Add parentheses around all print statements
Required by Python 3.

Change-Id: Ia28491882a844d3642da38145b1ebfcfbd5883b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-05 10:31:19 +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
Christian Stenger
ae8d9af6f4 Squish: Fix expectations
The output on finishing debugging had changed.

Change-Id: I8193718594c0aceef13867d6acd1c8c0aaba6353
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-06-21 11:12:21 +00:00
Robert Löhning
8d813b8864 Squish: Remember where breakpoints are
So we don't have to update the test each time
Creator changes the project templates.

Change-Id: I76f96f719895f2f8cadccaf9c91cc85d1735ce13
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-23 09:45:06 +00:00
Robert Löhning
aaa5b93b2e Squish: Simplify API of doSimpleDebugging()
No need to pass a value which never differed from len(...)

Change-Id: Iea481abed0ebfa9acf05456bc2ff1f01c7bc0d1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-21 17:27:31 +00:00
Christian Stenger
0210dfd494 Squish: Fix line number of expected breakpoint
Template code has changed so the line has moved.

Change-Id: I4b42eaeff56e1c76273635d8ae2e190b4631d92d
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-04-21 13:12:08 +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
Christian Stenger
412b661672 Squish: Correct hitting "Do Not Show Again"
Original implementation just made it work for the common use case.
If the order or the selected buttons differed from the common case
this failed.
Beside this it is later on more easily to extend.

Change-Id: I581b0af2579fa728a81b9946028ade5559f17fd8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:10:53 +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
de04f29198 Squish: Wait for the docs update progress bar
Change-Id: I73e80119a7e5a8d09397138d1301154af597f907
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-02-25 08:02:37 +00:00
Christian Stenger
122fdf6e5a Squish: Make another helper tool compatible
Change-Id: I1fc4e268e311c628b541b76ae3a948854635a4a5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2021-01-18 14:19:30 +00:00