Commit Graph

76860 Commits

Author SHA1 Message Date
Jarek Kobus
38316079f3 UnifiedDiffEditor: Early return inside jumpToOriginalFile()
Change-Id: Ib397c316296db494b81a08214049884c45a3f5e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-30 07:41:54 +00:00
hjk
191815e974 BinEditor: Clean up translation contexts
Change-Id: Ibeb8c93ad1dfa816ccf1160abae8aac6781157d9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:32:49 +00:00
hjk
479403e320 Bookmark: Clean up translations
Some unusual contexts went unnoticed so far.

Change-Id: I6017d8ae92310ee3b56538d1fa5c52f0de0a4c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:14:57 +00:00
Leena Miettinen
65d6c663e3 Doc: Describe the Help > Change Log option
Task-number: QTCREATORBUG-27876
Change-Id: I484070f77695652642c6b2a12a57b2d0ec691708
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 07:14:43 +00:00
Christian Stenger
58a4cd0804 CMakePM: Fix nullptr access
Amends 1b1fc43954.

Change-Id: Idfcf5bb2c58f37f366cb739475c7ba2d56d76e48
Reviewed-by: hjk <hjk@qt.io>
2022-09-30 07:11:24 +00:00
hjk
685cc1a2fc AutoTools: Move to Tr::tr
Change-Id: I605c2b5c812b500c1db2bdbfab26882ee55249d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 07:09:50 +00:00
Christian Stenger
bbd516f262 Core: Remove unused member
Amends 847d853055.

Change-Id: Iae28f7a7dbfd0fe3623cddaf6342c82964e435e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:09:45 +00:00
Eike Ziller
a0f008b8e1 Merge remote-tracking branch 'origin/9.0'
Change-Id: I4d1954622e28ff292ed7699268c5572102869d56
2022-09-30 09:04:25 +02:00
hjk
ab4c9b9679 CMake: Move to Tr::tr
Change-Id: I169da93b5184351cb915d4c198fd33318fcfe06f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 06:56:21 +00:00
Jarek Kobus
9f25c2dedf DiffFileInfo: Export it back again
It should be still exported as it's a part of
FileData class, which is also exported.

Amends b677fbe992

Change-Id: I0d53dff2c355cddf7d1f3d001cb7b71210c75223
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-30 06:49:24 +00:00
hjk
38f88f6310 Core: Inline findwidget.ui
A lot of unusual stuff where LayoutBuilder doesn't shine...

Change-Id: I06259e0913fade2d70ebfbab3f438cb8f7e96bf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 06:34:08 +00:00
Petri Virkkunen
1c2ffde787 Android: set release flag when building and deploying apk
...in Release builds

Signed Release builds are now deployed correctly by giving
androiddeployqt the --release flag during the Deployment step
for Release builds.

Unsigned Release apks are now correctly built under the release
directory by giving androiddeployqt the --release flag during the Build
step for Release builds instead of determining build type from whether
or not the package is signed.

Fixes: QTCREATORBUG-28163
Change-Id: I319bc95325c88fb84a5997c9237df65eb7983c0e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-30 05:58:47 +00:00
David Schulz
01ddb61ab7 Editor: Fix reassigning a document to an editor
Moving all initializations that are not influenced by the document to
the TextEditorWidget(Private) constructor. So we do not reinitialize or
double connect unintendedly.

Change-Id: I42f4e8166c21aec9c8b780033b12eb8dae5f72a6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 04:19:17 +00:00
David Schulz
2710e68610 LanguageClient: guard client access in formatter
Change-Id: I76bd41b3a786b1893bc159e0363f90494fd14b9f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-30 04:07:57 +00:00
Jarek Kobus
99589a7572 UnifiedDiffEditor: Move some methods into UnifiedDiffData
Like it's done in case of SideDiffData.

Change-Id: I27af423e50277c81e596006c960daecc6a51145f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 18:46:15 +00:00
Jarek Kobus
b677fbe992 DiffUtils: Introduce DiffChunkInfo
Avoid code repetition.

Change-Id: Iea9acef8f8b27793528fa7eaf7044e12dcd21d10
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 18:46:10 +00:00
Jarek Kobus
daa942393a DiffEditorPlugin: Introduce DiffFileInfoArray
Change-Id: I884d72e6c500e41969f379d969bcf1f46be8fd5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 16:14:04 +00:00
Jarek Kobus
835b278c00 DiffEditor: Use namespace Utils
Change-Id: I0869c6ed0e2173ce46ebde7deebe5352034daedb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:53:50 +00:00
Jarek Kobus
aacf25ebb6 SideBySideDiffEditor: Fix context
Suffixed are meant to be different for both editors.

Amends 2d360db2c3.

Change-Id: I4bf8f2b066dbf420eba38a56301d6e24a685caf3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:53:44 +00:00
hjk
847d853055 Core: Inline mimetypemagicdialog.ui
Change-Id: Iedc66b6915028af3551e3ac910e417fce3f0466d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 15:33:15 +00:00
hjk
f376b06648 Core: Inline mimetypesettingspage.ui
Needed to keep the QCoreApplication::translate for now as the class
has a Q_OBJECT creating a different context.

Change-Id: I1b1d836be675bdcd2802070032a7ace92838498c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 15:31:20 +00:00
hjk
bb6847e3ec QbsProjectManager: Proliferate the use of FilePath
Also use path() instead of toString(). While this doesn't change
anything as long as there is no remotely running QbsSession,
path() would be the better choice then.

Change-Id: Ief98536b34fe615f6b0be03cb3072df7b69f293b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-29 15:27:24 +00:00
Jarek Kobus
460f347757 VcsBaseEditor: Get rid of diffChunkApplied()
Drop unused arg from diffChunkReverted().

Change-Id: I5531645d317d62ae92cd0e63dadd583f8ab8996d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:15:38 +00:00
Jarek Kobus
b67c868f75 PatchTool: Introduce PatchAction enum
Add static PatchTool::confirmPatching() and reuse it
in two places.

Use Tr::tr() inside PatchTool.

Change-Id: I70779619dbb58ab6e46a585bbeff51588ccb2f53
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 15:15:30 +00:00
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