Commit Graph

76686 Commits

Author SHA1 Message Date
Jarek Kobus
2d360db2c3 SideBySideDiffEditor: Avoid code repetition
Change-Id: Ie49834a4896dbf32a87329345e52dc99ca2f86bd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:15:21 +00:00
Jarek Kobus
38b19bfae6 DiffEditor: Cleanup includes
Change-Id: Id8127b9b0c99ee2a0d5d367cb551a1d5779c5d38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:15:12 +00:00
Henning Gruendl
502e94cbe9 QmlDesigner: Improve state group rename dialog
If the user presses enter when having focus on the TextField inside the
StateGroup rename dialog it will submit the change and close the dialog.
If the user presses escape it will reject the change and close the
dialog.

Task-number: QDS-7764
Change-Id: I8626c7b9ca9bf6d087c226343b3e6833641da54c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-29 14:45:50 +00:00
Henning Gruendl
3f6d8e8cd6 QmlDesigner: Fix base state update
Task-number: QDS-7799
Change-Id: I89216cdb8fb641e6b51c22b32e6a845e7952c601
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-29 14:45:25 +00:00
Christian Stenger
746632ed10 Squish: Replace placeholder icons
Change-Id: I26e60b918c89fa1f276389c3703b393ea16ef89c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 14:07:18 +00:00
Marcus Tillmanns
1b1fc43954 CMake: Convert paths to device
The values coming from a CMakeConfig do not contain
the device they are relative to.
This transforms the FilePath to be relative to the device
that the cmake executable was run on.

Change-Id: I7bfdf065ddb4acfc751ac6456f1c32398393e2ad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-29 14:04:39 +00:00
hjk
7ec2e724fe ClearCase: Move to Tr::tr
Change-Id: I0f65dfab1c73315d6877cfcc8a04cf202c0a3cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 13:26:03 +00:00
Christian Stenger
0a7e6ef44f Squish: Fix handling of test cases
Squish uses the test case entries inside the suite.conf
only for sorting and determining the run order.
In fact all folders inside a suite that match the common
pattern will be used.
Adapt our handling accordingly.

Change-Id: I57121bb7715c648b6f0416012c71227261e140b9
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-29 13:19:03 +00:00
Christian Stenger
2d8f02fb0e Squish: Fix handling of suite.conf
Reading and writing using QSettings was quite a bad idea.
Introduce helper functions to read and write the content
of the suite.conf and ensure correct parsing of the values
for the AUT or the test cases.

Change-Id: Idc8b0935c7eb2603a476c358e3f2ba76d3d29d33
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-29 13:18:46 +00:00
Christian Stenger
2fa3b9dede QmakePM: Fix compile
Change-Id: I3cae748778750f41bb9c075c2b3ac23e36fc1aac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 13:12:15 +00:00
David Schulz
4780996c46 Core: Go to pattern start when pressing home in locator
If the cursor is already at that position move the cursor to the start
of the line edit. This mimics the editor behavior that home moves the
cursor to the relevant position for that line, and if the cursor is at
that position move to the actual start of the line.

Change-Id: Ieedbc0de0f93b0ffa3f3b64ccbcb04471b004e8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-29 12:47:27 +00:00
Alessandro Portale
76238bed6c QmakeProjectManager: Convert to using Tr::tr
Change-Id: I08393b1f27bf238c8ac0ccb99e63e56a9d21ecb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-29 12:08:43 +00:00
Antti Määttä
b16d1e2b11 Add more checks for backwards compatibility
Stop using MaximumXXXType in events where they might be saved into
trace files. It makes older traces incompatible with new traces if
new fields are added since new versions treat them as valid events.
Instead use UndefinedXXXType that doesn't change if new fields are
added.

Add checks for event types greater or equal to MaximumXXXType where
they are missing so that older versions do not process new
unrecognized events.

Fix opening old traces by checking missmatch between quick3d event
and the range type.

Fixes: QTCREATORBUG-28146
Change-Id: I8950da2d636ef1fedf4500916896a9ecae222166
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-29 11:04:24 +00:00
Antti Määttä
0f49728c32 Fix backward compatibility issue with QmlProfiler
Previous implementation uses MaxMessage and MaxRangeType constants to
specify events with undefined message or range type. This causes
backwards compatibility issue if new message or range types are
added, because those constants are also written to files when saving
profiler traces.

Add UndefinedMessage and UndefinedRangeType constants and use those
instead of the MaxMessage and MaxRangeType constants. This doesn't fix
opening old traces, but the same problem won't happend again with new
traces.

Also update profiler autotests with fixed data.

Task-number: QTCREATORBUG-28146
Change-Id: Ief003d39f871dd1ff2cc908e6a4d4b4678fd0868
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-29 11:03:56 +00:00
Jarek Kobus
67121e6cd3 DiffEditor: Fix scrolling to current file after reloading
This feature got broken during recent refactorings.

Change-Id: I9d2d24e7ed63d5512b64c53e4bb9303497871d5e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 11:03:27 +00:00
hjk
1cf6b031cf ProjectExplorer: Create wizards one by one
Makes it easier to shuffle them around.

Change-Id: Id80064a05ff6d2b76ec9033b4e0065f0bd0d81ae
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-09-29 10:48:07 +00:00
hjk
55ed34ced8 CMakeProjectManager: Use QList in PresetsData
Less impedance when interfacing the rest of the code.

Fixes

     warning: comparison of integer expressions of different signedness:
     ‘std::vector<....>::size_type’ {aka ‘long unsigned int’} and
     ‘qsizetype’ {aka ‘long long int’} [-Wsign-compare]

Change-Id: If5e1e770e2ed170aa4259963fa7ca0d6642190d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-09-29 10:44:34 +00:00
Marcus Tillmanns
d093a7b69d QnxPlugin: Don't force validate each Kit
The QNX Plugin did call kit->isValid() for every Kit, even
if it is not a Qnx Kits.

This patch turns the check around to first make sure that the Kit
is a Qnx Kit, before validating it.

Change-Id: I47bc20ffd1387deab3ab5ec3a56d9536b76d515f
Reviewed-by: hjk <hjk@qt.io>
2022-09-29 10:38:18 +00:00
Eike Ziller
e27653a3d3 Work around lupdate issue and get rid of "Tr" context
For some reason lupdate doesn't find the right context and adds a "Tr"
context. Fully qualifying the call helps.

Change-Id: Ib993ad2d742a88352c9c2021184100eaa659b9b6
Reviewed-by: hjk <hjk@qt.io>
2022-09-29 10:15:13 +00:00
Eike Ziller
a254a9ba54 Merge remote-tracking branch 'origin/master' into work
Change-Id: I2235a55a599aaeca5d2b5377300a044b66c17da9
2022-09-29 12:03:13 +02:00
Marco Bubke
ac21848acc Utils: Make some HostInfo functions constexpr
Enables the removal of static function scope variables.

Change-Id: I337468c1525546a5cad9e95ae4a859de18ee514d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-29 09:42:31 +00:00
Mahmoud Badri
e8ebd8e497 QmlDesigner: Fix material drag glitch on Mac
Fixes: QDS-7461
Change-Id: I5b29742e7f27cbf14e689fd4b440480ebb1e6792
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-29 08:17:27 +00:00
Cristian Adam
77bba6d640 CMake: fix CMake configuration error
Amends 860d003a34

Change-Id: Ie87d2188291270cf1dd05d25bae24d0ea5ef6569
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-29 08:07:02 +00:00
hjk
cfc9f6d2f3 CMakeProjectManager: settings page code cosmetics
Change-Id: I657fa72d5b625877dc1deec229f6f5c7c16358fd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-09-29 07:55:07 +00:00
Marcus Tillmanns
d510451b11 FilePath: Don't searchInPath if already absolute
searchInPath returns *this if it is already absolute.

Change-Id: Ie1fe8beed67402a9c7eacf04b34bbfb3296b2180
Reviewed-by: hjk <hjk@qt.io>
2022-09-29 07:50:29 +00:00
Marcus Tillmanns
736f778e6d Dockerdevice: Make sure that container is started
When a QtcProcess is the first thing using a dockerdevice
the container was not started and the call would fail.

Adding updateContainerAccess to withDockerExecCmd
makes sure that the container is started.

Change-Id: I7e05df1aa5e05dc55606970214109b13b142181e
Reviewed-by: hjk <hjk@qt.io>
2022-09-29 07:33:42 +00:00
hjk
18376ebb24 ClangTools: Inline clazychecks.ui and tidychecks.ui
Change-Id: I0cde87086bc0117bc6b43ec6fb4a9a8153ccd3e3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 06:37:33 +00:00
Christian Stenger
9abecfce01 Squish: Implement create new test case
Change-Id: I8eeef2d024d6c8b71e2c2482f7da05b9ff221ed9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-29 06:09:16 +00:00
hjk
420386195f ClearCase: Inline checkoutdialog.ui
Change-Id: I2edc1471428a922857e4b847e249438a959d8943
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 06:03:24 +00:00
hjk
7e93ab9a27 ClearCase: Inline versionselector.ui
Change-Id: Ib1f0b0b3944ffab86685ec25d863aa5519edeb9a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 06:03:16 +00:00
hjk
7fe2432c78 ClearCase: Inline undocheckout.ui
Change-Id: Id687cc5346cbbac01258efdf28eac427e7d97581
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-29 06:03:11 +00:00
hjk
1753840f7a ClearCase: Inline settingspage.ui
Change-Id: Ie870e99d691049aca6b856c23f01293a307b72ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-29 06:03:06 +00:00
hjk
c22fcef5ce CMakeProjectManager: Avoid direct QFileInfo use in cmaketoolsettingsaccessor
Change-Id: I0fe6fc9b84cb810f43d7f0d737afa5fa299ac724
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-29 06:02:56 +00:00
hjk
e4b1c1754c Android: Remove QFileInfo use in AndroidAvdManager
Change-Id: Ied226a83fe2c0628430a8e339cde4354f726026c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 06:01:52 +00:00
Cristian Adam
e02f4a0518 CMakePM: Add support for build CMake presets
This patchset will add support for version 2 of the CMakePresets
feature that has been implemented in CMake 3.20

https://cmake.org/cmake/help/v3.20/manual/cmake-presets.7.html

Task-number: QTCREATORBUG-24555
Change-Id: I08934243cc04487d38c4b59c2ad4a4a8d0484492
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-28 21:24:53 +00:00
Jarek Kobus
6ea3aad0a2 UnifiedDiffData: Remove unused charNumber argument
Change-Id: I40331b4471a1aa716003943ecfb92a9ee7a4e406
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 20:30:34 +00:00
Jarek Kobus
084c310c44 UnifiedDiffData: Rename setDiff into diffOutput and make it static
Conform to sibling struct SideDiffData.

Change-Id: I7630ec7480c34a94f17ef09904e332da768f0c37
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 20:30:30 +00:00
Jarek Kobus
53fc68bc08 SideBySideDiffEditor: Move showing diff into separate thread
Change-Id: I8b0a4835cf6f51e4acfd483dcfc7b94585c64bf5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 20:30:25 +00:00
Jarek Kobus
83be3443de SideBySideDiffEditor: Avoid code repetition
Change-Id: I48d42bd4a6134b24df8bec4239678e7db32ad3e0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 18:11:23 +00:00
Jarek Kobus
15fd4a0754 UnifiedDiffEditor: Avoid code repetition
Change-Id: I2e361b29c3d35fe5128b6b5a4a90b6c4ee0de432
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 18:11:17 +00:00
Jarek Kobus
472d791fec DiffEditor: Use DiffSide in DiffEditorInput
Change-Id: I195c37f29884f1d066acbb54c8ace07f8801f829
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 18:11:10 +00:00
Jarek Kobus
6ec7ce539b UnifiedDiffEditor: Move setting folding markers into thread
Change-Id: I4fc6f08039813c08e70a6798f65abcea219558be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 18:11:03 +00:00
Jarek Kobus
f66320c413 DiffEditor: Simplify DiffSelection
Change-Id: I9de3774fafa9f257974a4231a83b64f375291d87
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 18:10:32 +00:00
Jarek Kobus
3877ced865 DiffEditorPlugin: Add SideBySideDiffOutput
Move generation of SideDiffData into static diffOutput()
method.

Change-Id: Ie38b3e09dd8222e0219fdfb345bc7cf4a39f6e21
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 18:10:26 +00:00
Jarek Kobus
0def7c83d4 DiffEditorPlugin: Various cleanups
Change-Id: Ic0c9c397067b899932bc39d938e63df36fa4caeb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 18:10:02 +00:00
Jarek Kobus
e67e2121a7 UnifiedDiffEditor: Move polishing selections into working thread
In case of big commit (like 05c35356ab)
polishing selections took about 200 ms. Move this work into
thread to avoid extra 200 ms freeze of GUI thread.

Change-Id: If159e3f0869264f467c4c015f944a3054609f812
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-28 17:13:49 +00:00
Jarek Kobus
2f0ec75284 SideBySideDiffEditor: Refactor internal data
This is a preparation step before making diff showing more
interactive.

Change-Id: I15ab0583af6e4a2655b39b8ae3fb7da10ac245f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 15:48:47 +00:00
Jarek Kobus
91c4e06712 DiffEditor: Use DiffSide enum inside ReloadInput
Change-Id: Ib81eebdaf58686f27e8663787be5974aab46ce22
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 15:48:40 +00:00
Jarek Kobus
f3a7299761 DiffEditor: Use DiffSide enum inside FileData
Change-Id: I4c18c52a9737cc46c3faeadf0abd5c4771463e0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 15:48:34 +00:00
Jarek Kobus
6dc412e255 DiffEditor: Use DiffSide enum inside ChunkSelection
Change-Id: If23b0f46856eebec96624e58b6ad90b1b3e8be23
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-28 15:48:24 +00:00