feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

1764 Commits

Author SHA1 Message Date
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
Christian Stenger
dd3f5d3a6a SquishTests: Fix designer test 
Children inside the object inspector are sorted
lexicographically nowadays.

Change-Id: I2f704e3a3cca526246babb2b12d48fe359eb6e6b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2023-02-03 14:26:25 +00: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
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
Robert Löhning
54326a127e SquishTests: Use openDocument()'s return for verifying project tree 
It's used anyway, relies on the expected project
tree and works around a problem on some machines.

Change-Id: Ic1e3e7a3f492f37d70c4409699ca78ad548d7445
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-02-01 12:41:47 +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
Eike Ziller
e9b177db7d Merge remote-tracking branch 'origin/9.0' 
Conflicts:
	src/libs/utils/filepath.cpp

Change-Id: I04761cf7c99ed67322a592cbd0ae48c1ae9c708a
 2023-01-25 14:11:01 +01: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
Robert Löhning
270c0ffa3a Squish: Use consistent permissions 
Change-Id: Id2849d4aaa2da181df0e674a971abd89c3083662
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-01-23 11:41:28 +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
a3c1b35475 SquishTests: Update tst_designer_autocomplete 
ui_mainwindow.h is being created on first build. While there
seems to be some workaround for qmake-based projects, cmake-based
projects can't be parsed properly before the file was written.

Change-Id: I0e9802f79b60d7d07ed92ca0ae9b93e53249b61f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-01-02 14:19:41 +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 Löhning
3874ac236d SquishTests: Stabilize tst_codepasting 
Avoid
"Error in type() invocation: Could not
activate toplevel-window for widget"

Change-Id: Ib68a975724ad3824800bdcb542916b6644f1dc7f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-12-15 08:33:25 +00:00
Robert Löhning
7b073efe4a SquishTests: Update tst_QMLS04 
Change-Id: I383e8f652ae233df7ed5bef93dcaa9a43fe95f0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-12-15 08:32:58 +00:00
Robert Löhning
bbd5d6c7ae SquishTests: Update FindToolBar 
...as seen in tst_CSUP05

Change-Id: I1736a4ec9c69a3db3fc98ea1234b0363ceeaef41
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-12-15 08:32:30 +00:00
Christian Stenger
75177f4c34 SquishTests: Expect some more error message 
Change-Id: I33f359673e6d23f0188072db891db08dafa72ace
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-12-14 05:06:25 +00:00
Robert Loehning
b85183d966 SquishTests: Improve tst_memberoperator 
- Update expected behavior
- Update to ClangCodeModel replacing "." with "->"
  only after selecting a completion
- Update to ClangCodeModel no longer announcing
  needed substitution in proposal widget
- Added test for unchanged lines
- Stabilize by using proper wait conditions
- Fix surplus warning

Change-Id: Ia90e0102d44fbd8abb41acaa83509657ad11bf4d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-15 08:48:16 +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 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 Loehning
01bbe3a4d5 SquishTests: Remove unused object 
Amends 2acc90a0ba

Change-Id: Ie88fb9278c81b3c7a27df93a78978974d86e5377
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-09 13:22:31 +00:00
Robert Loehning
af6741b5f2 SquishTests: Update tst_basic_cpp_support 
While the old code model used to jump to the "extern" line,
clangd jumps directly to the linked variable.

Change-Id: I2817d87697b6040afdd538e8e15b4b40ef17e124
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-09 13:21:58 +00:00
Robert Loehning
c4164738b8 SquishTests: Stabilize tst_basic_cpp_support 
Make sure the CppEditor is available before proceeding.

Change-Id: I34ed4f581637cc3608283ac045ceb5b4e6ada55a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-09 13:21:38 +00:00
Robert Loehning
176df5827e SquishTests: Fix tst_CSUP04 
Change-Id: I4d9546c13451d8e56a1bc616c3ac8a7640db3204
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-07 11:41:46 +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 Loehning
d063e21c2e SquishTests: Update and stabilize tst_HELP06 
Change-Id: I1d97a550c9b63b8b04f0bd32d23c5bf249b6ccc5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-28 13:50:07 +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
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
Robert Löhning
f42282b492 SquishTests: Update "Save before build"- checkbox 
Fixes tst_save_before_build

Change-Id: I7af2c215dcb55796498875d1ed62783f37edb664
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-24 07:14:27 +00:00
Robert Löhning
061948e2e6 SquishTests: Update SaveItemsDialog and ReadOnlyFilesDialog 
Fixes tst_modify_readonly

Change-Id: I1ba81af321a8ca3d5498d68e2d85abd1214546b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-24 07:14:00 +00:00
Robert Löhning
e5aaf00453 SquishTests: Update NewDialog again 
Change-Id: I7cb4296c8938ce5e04994863fdd69024f1e9d909
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-10-20 14:03:19 +00:00
Eike Ziller
ea5a050c5c Merge remote-tracking branch 'origin/8.0' into 9.0 
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
 2022-10-18 10:48:46 +02:00
Christian Stenger
0264aa2a21 QtSupport: Restore some more object names 
Change-Id: Ia88dd8e5d3b512227f4d81e01573881afdfbe58c
Reviewed-by: hjk <hjk@qt.io>
 2022-10-17 12:38:51 +00:00
Robert Löhning
a16e74fe96 SquishTests: Fix type of Git.ChangeSelectionDialog 
Amends 729805e7fd

Change-Id: I79f67e5d233734ab25da1ff8a2d135061fa139e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-10-17 09:35:56 +00:00
Robert Löhning
bf45aa4d24 SquishTests: Update tst_git_clone 
Reverts f5f684a609

Change-Id: Iad797f87333e8d793e34c4e7df1f68c5f6508f82
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-17 09:35:39 +00:00
Robert Löhning
d95977db90 CPaster: Restore some more object names 
Change-Id: I590baed6d2a2ea4a8dd56f471ac7d4d0a015c725
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-17 08:51:23 +00:00
Christian Stenger
86d41d58a8 Squish: Restore some more object names 
..and adapt test slightly. Fixes generic highlighter test.

Change-Id: I72de310d55ceadc684d15d4e257cd1d90fcf836b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-10-17 07:16:53 +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
Christian Stenger
9e659ac759 Squish: Adapt to missing object names 
Change-Id: I0bf9bde83bbe78b875775f245268b137ddb71d32
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-10-12 13:27:44 +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
Robert Löhning
729805e7fd Git: Restore object names for dialog 
Amends ffcf85958f

Change-Id: Ia48b114137d722df5f72add818d5729adff94110
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-06 07:48:45 +00:00
Christian Stenger
378d813797 Core: Restore object name for dialog 
And adapt usage inside tests.
Amends f5c725cf23.

Change-Id: I8f1e47ea206e34a242988373fa569d547d8d637d
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-10-05 12:59:18 +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