Commit Graph

779 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
8764bab627 SquishTests: Improve version detection for imports
Change-Id: If38aa92c22c3390859f738ad5bfa5bacf47302ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-09 08:29:14 +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
82b5cc89cb SquishTests: Log used Python version
Change-Id: I60cb928382840f34800af6a8ee1ed7f084acfb93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 07:33:12 +00:00
Robert Löhning
200d3b455b SquishTests: Don't test.verify state of checkbox in getBuildIssues
- It generates a ridiculously large number of test results in
  comparison to what's actually tested
- In tst_memberoperator, it is used in waitFor(). Thus, it depends
  on timing and the number of test results varies from one
  execution to another

Change-Id: I7d4ad8f87590b4fc2dda51e9eda703961c7acd9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:35:38 +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
41e78b9e57 SquishTests: Fix compiler substitution on Windows
Change-Id: I970622c888d6c8b7c63e8b1674419ba900ea6d24
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-04-06 13:56:47 +00:00
Robert Löhning
f7ad1f02a1 SquishTests: Fix waitForProjectTreeItem() for python3
Amends 892ccd2097

Change-Id: I18e2c9a5407e4c70dfdae5e9c17959897ea33d50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-06 13:05:40 +00:00
Robert Löhning
42c653b53c SquishTests: Don't filter out code model issues when we need them
Amends c46dff0199

Change-Id: I5f2613edf15f86161a576ab21f16f079bd12a59f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-06 09:38:54 +00:00
Robert Löhning
892ccd2097 SquishTests: Add function for finding elements of project tree
Change-Id: I08c3c22a404d2b58bdb1205f22e5cf937c6027b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 09:51:01 +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
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
c46dff0199 SquishTests: Fix checking for build issues
Do not count code model issues as build issues when checking for them.
Fixes tst_build_new_project on the Linux machines which fail for unknown
reasons.

Change-Id: I2cd77b0208019fc902742197c0def6d3811cfced
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-28 13:20:10 +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
ca030b5a9a Squish: Fix windows toolchain for VS15
Similar to what has been done for fixing VS2017. But VS2015 also needs
to add a matching Windows Kit tools path.
This magically happens if the kit is set up manually, but as we
provide a stripped version of toolchains and kits we need to adjust the
kit environment manually.

Change-Id: I9a88e7424acf2768774f5ef580ef6d1fa73bcb5a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-01 12:08:33 +00:00
Christian Stenger
0604027834 SquishTests: Fix path handling for pre-installed Qts
There is now a Qt6 and a new possible location.

Change-Id: I4feac6da2756bde77e98ce08f945ddefec7e2fb4
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-23 12:51: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
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
7a26b76ce3 SquishTests: Tweak preparation of toolchains
Prepare toolchains for usage. Basically parameterize function
to be used with more than one version and make use of it.

Change-Id: I30ee198302de54d933fa7c436e701273d497cc07
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-16 14:07:51 +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
Eike Ziller
b29cb4efe1 Merge remote-tracking branch 'origin/9.0' into 10.0
Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
2023-02-10 10:29:14 +01:00
Christian Stenger
ff65caf62f SquishTests: Explicitly convert QString to str
Change-Id: Idcd70a18ed5535d8ad76c09007558cb96f20d178
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-09 13:51:26 +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
David Schulz
0dab651ccd Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I7e171601cd7317b48d5074bbc0ead127813d596c
2023-02-01 08:16:30 +01:00
Christian Stenger
c22b4b35e1 SquishTests: Redo open document from navigation view
For unknown reasons this does no more work on a couple of machines.
Re-doing the original approach by explicitly expanding the tree as
necessary up to the file we want to open.

Change-Id: I329e18f3e2162e381e11fb6164a448ae67def606
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-27 11:33:12 +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
698a495972 SquishTests: Use existing function saveAndExit()
Change-Id: I2e10de8b454a69b3e4ade7520b4fa00415bcde42
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-15 14:45:42 +00:00
Christian Stenger
75c43f926b Squish: Stabilize invoking context menu
Try a second time if the wanted menu item is not active when
triggering the context menu the first time.

Change-Id: I742db645542e6775baaa77fbdb1fd5a8e9a120f2
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-12-15 09:11:01 +00:00
Robert Loehning
c6e08d6940 SquishTests: Enable clangd also on machines with low memory
Change-Id: I92caa0da779aacf731a0aa23a86f55e659c51d2b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-11 09:14:35 +00:00
Robert Löhning
724d275f4f SquishTests: Update tst_QMLS01
Change-Id: I8313aa6dbd9120341bcd9eee7b8d7c72f051a9b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-07 09:50:04 +00:00
Robert Löhning
5039ebff70 Help: SquishTests: Updates for tst_WELP01
Change-Id: I2e25f8c3368c4c00c13827f5eb70d9e3a4fc5a9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-26 07:33:16 +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
Christian Stenger
0f24475f48 Squish: Adapt to changed ui
Change-Id: Idbee4f2a4d1536cc1dc6a7822d4415032feb9a28
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-10-13 10:45:51 +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
Eike Ziller
5d55cfdae5 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
	src/libs/utils/fileutils.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/nodemetainfo.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/remotelinux/linuxdevice.cpp
	tests/auto/utils/fileutils/tst_fileutils.cpp

Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
2022-09-19 09:54:06 +02:00
Robert Löhning
a35ebe2753 Squish: Update and improve isMsvcConfig()
Change-Id: Icff3a8178e89623097e2da7ff8f1e72197f1a4dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-16 08:09:53 +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
Eike Ziller
84ff5eb169 Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20
2022-06-07 10:28:37 +02: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
Eike Ziller
6a296ab68a Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
2022-05-18 13:35:47 +02:00
Robert Löhning
67f907f295 Squish: Fix MSVC2017 toolchain
Without this, Creator cannot set up CMake properly
in the kit so configuring projects fails.

MSVC2015 also needs a fix.

Change-Id: I19c065eb087d098174c84301aa52cc3888ec42b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-18 08:56:43 +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
Eike Ziller
9bf0efcbb9 Merge commit 'origin/7.0'
Change-Id: I90148816d32c81b9fef982b5010c785161d83097
2022-05-10 11:45:37 +02: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
Eike Ziller
3b2134711b Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
2022-04-20 16:12:41 +02:00