Commit Graph

7974 Commits

Author SHA1 Message Date
Tim Jenssen
912082e6a8 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I1f6114244514a2b786a8b0d364a303b925ad7757
2024-04-10 17:30:10 +02:00
Thomas Hartmann
4f3bf836a9 QmlDesigner: Remove ScopeChain dependency for QDS_USE_PROJECTSTORAGE
* possibleImports() and usedImports() has to be implemented for the
  project storage
* getQMLSingletons() is not implemented for project storage and also
  does not belong into the rewriter.
* semantic errors are fully disabled for QDS_USE_PROJECTSTORAGE, since
  they require the scope chain.

Change-Id: I200ccbc1faf2631c4764a4676553a69cc0f5cf1f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-04-10 13:43:29 +00:00
Robert Löhning
4529644027 SquishTests: Stabilize tst_rename_file
If for some reason, the "Rename..." item in the context menu is disabled
when opening, it will not change to the enabled state later. One has to
open the menu again to get the then enabled item.

Change-Id: I86768186e18763a9b7bea9fb7032c268320807d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:33:29 +00:00
Robert Löhning
355e3ecdf8 SquishTests: Rename object
to avoid strange errors when trying to use object.exists()

Change-Id: I919a7fe90e00daad2040b5e4f2c271de807aea16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:31:30 +00:00
Robert Löhning
95df308bc3 SquishTests: Remove compatibility code for Python 2
Change-Id: Ibcf9a76fb163aa7167ad0ef0616c39b33c30d7c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:30:00 +00:00
Marco Bubke
4e5a0cd02b QmlDesigner: Improve performance of prototype walk
The optimizer took quite often the slow join first. So now we have one
method to walk the prototype chain and then use the type ids in simpler
statements to get the end result.

Task-number: QTCREATORBUG-30599
Change-Id: I3e9d4ec85ba75801769eb8760fda6e0400300899
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-09 13:41:14 +00:00
Marco Bubke
6751fc82ef Sqlite: Prevent name collisions for indices
There can be unique and not unique indices with the same columns. So we
add that attribute to the name to distinguish between the indices.

Change-Id: I96eac1f0e95c135d625f09fd5399b16f2293d645
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-09 13:40:29 +00:00
Christian Kandeler
42edb0dd61 CppEditor: Make renameIncludes() also work for moved files
Task-number: QTCREATORBUG-26545
Change-Id: I0bfe203af8f091562cdd91411dbe502fc5a76956
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-04-09 08:18:30 +00:00
Eike Ziller
2626af4cd4 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/libs/utils/fsengine/fileiteratordevicesappender.h

Change-Id: Ia61fa12d14a4f862549509bd980cf9f66905c17f
2024-04-08 11:08:05 +02: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
Eike Ziller
309a01337f Merge remote-tracking branch 'origin/13.0'
Change-Id: I12578a55fb61a3a9620c749c0b3bbbae6dcb4493
2024-04-02 14:54:30 +02:00
Robert Löhning
b887825661 SquishTests: Make sure that *UnderCursor() return a str
Without this, "line in lineUnderCursor(w)" can be False
although "line == lineUnderCursor(w)" is True.

Change-Id: I7fa6be7d237957706bf1ad93d7303c55b81f24ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-02 09:36:34 +00:00
Miikka Heikkinen
fd3047bac2 QmlDesigner: Join sleeping task queue thread
Threads are still considered joinable after their execution. So sleeping
thread have to be joinded first. Add test

Fixes: QDS-12308
Change-Id: Ie01588293e3b7ce9fe149d52a25ba03d174cca88
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-27 11:05:37 +00:00
Thomas Hartmann
f63bd7f933 QmlDesigner: Crash fix
* Add QTC_CHECK for crash
* ActionAreas should not be "garbage" collected if they have no target.

* Initial ActionAreas do not have a target and ActionAreas without target make sense to a user. We do not want to delete them together with the target.

Task-number: QDS-12181
Change-Id: Ie520c47aad990a8ff07fc3346e6772226d334ce5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-27 09:33:20 +00:00
Tim Jenssen
8a18423175 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I28e2e8cacf9a20c8b2f5073f4a492862d814fb99
2024-03-26 15:59:34 +01:00
Christian Stenger
3b7d9178ae SquishTests: Fix default settings test
QC nowadays provides lldb on Windows which gets automatically
registered.
Beside this correct expectations for the compiler based on the
LLVM path that had been used for building the QC package and
might be the same on the machine the test runs on.

Change-Id: Ie9553b79bb0eb0012386bd71422005c184638046
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-03-26 07:06:43 +00:00
Robert Löhning
e32d6c482f SquishTests: Update tst_HELP06 once more
The tree of help contents changed again.

Change-Id: I9e40d8c2e248abb5b631b27f5013d1ef4cf9212c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-25 11:35:43 +00:00
David Schulz
d4e775ebc6 TextEditor: handle syntax highlight in batches
Use an elapsed timer in the syntax highlighter to periodically return
from the highlight and push a continue highlight to the end of the event
loop.
This allows the user to interact with the editor in between those
batches. If the user modifies the document in between highlighting
batches, the area that still needs a rehighlight is increased if needed.

This also reverts 62ea85ee6a and the
related changes.

Task-number: QTCREATORBUG-28727
Change-Id: I7c394dbdff658330bb72f3b68b9928980947db75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-25 08:57:37 +00:00
Eike Ziller
8500dd03bf Merge remote-tracking branch 'origin/13.0'
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc

Change-Id: I2db85da9f4a0593217951313020d71d430986961
2024-03-22 15:13:34 +01:00
Christian Stenger
c0a02ecd4e Tests: Adapt expectation for lldb
Amends 74a17e4521.

Change-Id: Ib144c15af7e8d83f110752e9898fef0d7466a812
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-03-22 05:37:26 +00:00
Robert Löhning
e3302afd09 SquishTests: Update tst_HELP06
The documentation page "Building and Running an Example" is not listed
in "Contents" anymore.

Change-Id: I7fdc01707f63d924bf215f398b7c710e62ec41f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-21 08:41:10 +00:00
Christian Stenger
4cb18ded74 SquishTests: Stabilize welcome page related tests
Change-Id: I3596f2d1f7ca2de27a25075309ccb6015a1bb619
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-03-21 08:19:44 +00:00
Eike Ziller
90e1d96019 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
2024-03-20 15:05:58 +01:00
Marco Bubke
26870406cd QmlDesigner: Trace project storage exceptions
Change-Id: I58c261bea4cca6c5bede0d2ad504be8bc687ddc6
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-20 13:13:27 +00:00
Marco Bubke
cea24ad00b Utils: Add char append to SmallString
Change-Id: I644db7635010da8bc29d87926a64c4e6939d7c83
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-20 13:06:46 +00:00
Marco Bubke
4fc1ca984f Utils: Add number Smallstring::append
Saves some overhead.

Change-Id: I7d46e41f29e66cd01f5a11f16e6f78ff7a4d0aa8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-20 11:13:53 +00:00
Marco Bubke
c9527e0341 Sqlite: Improve tracing
Change-Id: Id5d6ee448a7f2cf06cda2e2776f3dbbe7c8f66c4
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-20 11:13:33 +00:00
Christian Stenger
74a17e4521 Tests: Fix expected values
Amends 87ca7882c1.

Change-Id: I922b1afd3b62584717a913a3fcc5c1c2d2223cc8
Reviewed-by: hjk <hjk@qt.io>
2024-03-20 10:06:33 +00:00
hjk
87ca7882c1 Debugger: Fix QPair dumping
Task-number: QTCREATORBUG-30538
Change-Id: Iee17aec458d9ab69cd4349bedb26b1a2270ca41c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-03-19 16:00:23 +00:00
Alessandro Portale
f94ef9fdb7 Tests: Add *.figmatokens to manual/widgets tests
Change-Id: Ic4be9c65508052f95c07a5466ac397c060524a41
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-03-19 11:00:12 +00:00
Christian Stenger
f56542b39a Tests: Fix environment for test run
Change-Id: I32e491d06d9041b8ba6ad24badd6aa383ba1d163
Reviewed-by: hjk <hjk@qt.io>
2024-03-19 10:05:45 +00:00
Marco Bubke
402ac58d05 QmlDesigner: Fix missing BreakTemplateDeclarations
Change-Id: I00c042e5e0a04705e3c2773dca5499d9bfa32949
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-18 13:01:16 +00:00
Robert Löhning
301b06ca4c SquishTests: Make sure targets' details are collapsed after choosing
Other code expects all of them to be collapsed, but Creator 13 expands
them when checking. This change makes sure they are collapsed afterwards.
The new code is backwards compatible with the old behavior.

Change-Id: Ic698fb17f3ad1573195e7e0f7bcf722beed74ffc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-18 08:51:44 +00:00
Christian Kandeler
812326eadc CppEditor: Support try/catch in built-in indenter
Fixes: QTCREATORBUG-29452
Change-Id: Icf3d86a6080aeb741436800ae77af7c8bec3155c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-15 14:18:30 +00:00
Alessandro Portale
e0cf25fb55 Spinner: Allow setting the spinner color
Deeply under the hood, the color for ther Spinner was determined by the
QApplication palette, color role "Text".

In order to run the spinner on a dark toolbar (in a non-dark theme),
though, the color needs to be bright. It is the case for the
ScreenRecorder.

This change adds a color setter to the Spinner classes, adds colored
Spinners to tst_spinner and makes use of the feature in the
ScreenRecorder.

The default color of the Spinner remains QApplication palette, color
role "Text".

Change-Id: Ia75758707f225b1f994e73c5a314478101c80f5e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-03-15 14:09:30 +00:00
Robert Löhning
d54e98cdb8 SquishTest: Update sources for testing qbs
The old sources used deprecated features.

Done by:
1. Assuming that current Creator works correctly because
   it is passing the test with the old sources.
2. Replacing the .tsv's contents with what Creator
   generates from the new sources on Linux.
3. Removing everything from the .tsv which is not found
   in the same place on Windows.

Change-Id: I31f0f1a46c1972d8c717c216275dd453ca74fc27
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-15 08:25:14 +00:00
Robert Löhning
871b91b843 SquishTest: Clone sources just in time for testing qbs
...to decouple them from the sources used in other tests.

Change-Id: I80b3ea1478cdffdc28933e4320971f98a11d1898
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-15 08:24:44 +00:00
Tim Jenssen
9ce7aaccc5 Merge remote-tracking branch 'origin/qds/dev' into HEAD
Change-Id: I9d13aa050b1c7fb0954e2b63d13da2922d8f7218
2024-03-14 16:13:25 +01:00
Eike Ziller
1b97fdc100 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/debugger/gdb/gdbsettings.cpp
	src/plugins/perfprofiler/perfprofilerruncontrol.cpp

Change-Id: I0d5b914f9d9b5499920a5db484ef77af6ae748d5
2024-03-12 09:27:39 +01:00
Tim Jenssen
e7e9a58e46 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I8cd3cdf5854299d3017d6c6bfa656fc483a0e20b
2024-03-11 17:18:48 +00:00
hjk
b7b78df8be Require C++20
Prevent introducing C++20 problems for the master merge.

Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit e678da9934)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 12:09:37 +00:00
Eike Ziller
3dbdad20dc Utils: Fix build with MSVC with C++20
Rename process.h back to qtcprocess.h

MSVC's "threads" standard header includes <process.h>, and that ends up
including our process.h from Utils.

There already was a hacky workaround in place for a similar issue with
MINGW, but that doesn't work with MSVC because that doesn't have

Simply use a name that doesn't conflict.

Change-Id: I1159cd2096b4f2dbc4a1728d0131dd6edd30ebd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 5af531cd39)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-11 12:08:33 +00:00
Marco Bubke
8b7762621b QmlDesigner: Change model creation to new code model
The model needs the project store, the path cache, the imports and the
file path. So we now use a method in the model to copy them over to the
new model.

Task-number: QDS-12102
Change-Id: I80f911d55c5a5fdf9d1a87c1f4888e498086374b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 11:23:33 +00:00
Marco Bubke
6ebb7923b2 QmlDesigner: Deprecate optionally old node meta info API
If the project storage is activated the old API will be deprecated.
Hepefully people now stop to use the old API. You can still use it but
you have to write an implementation for the new one too.

Task-number: QDS-12102
Change-Id: Iac23da1648ff44e27a2ee7840e0d3eeb1fb8caf9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-11 11:23:27 +00:00
Robert Löhning
7813ce9335 SquishTests: Avoid warnings when reading build issues
tst_APTW01 explicitly disables the Clang Code Model
so there is no filter category of that name.

Change-Id: I7378e11582bb0231a24404cca212a234ef7f37ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 09:13:51 +00:00
Christian Kandeler
2524e2adb3 CppEditor: Let users provide statement macros
Like ClangFormat has.

Fixes: QTCREATORBUG-15069
Fixes: QTCREATORBUG-18789
Change-Id: I0ffb70be502d1c73aaaf436484ddc6704f152621
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-07 13:45:31 +00:00
Robert Löhning
43b54e8c3a SquishTests: Update button type in Welcome mode
Amends 9832af9701

Change-Id: I8840748e3bcb2c0993f93411b324e04a7f81960d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-07 11:12:28 +00:00
Robert Löhning
498625520a SquishTests: Don't try removing packages directories
Seems they are not being created anymore.

Change-Id: I8b48a848793fb73ea193918c14c322d6166b2053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-07 11:12:04 +00:00
Eike Ziller
8abc95331f Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppcodemodelsettings.cpp
	src/plugins/cppeditor/cppcodemodelsettings.h

Change-Id: I54937c39b06897a72a105e4e0a8b5f8a76c38e26
2024-03-06 15:10:15 +01:00
Christian Kandeler
1badc9f4a8 ClangFormat: Do not align parameters/arguments with the function name
The previous setting
    - wastes space, leading to problems when both the function name
      and the parameter (or, more likely, the argument expression)
      are long-ish.
    - necessitates re-formatting of the entire argument/parameter list
      on function renaming.

Change-Id: Ica82e284f9a5a8f2cf244938996039a59ce0b3aa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-06 10:20:25 +00:00