Commit Graph

8032 Commits

Author SHA1 Message Date
Marcus Tillmanns
a020c13e10 Filepath: Fix operator<()
Previously a QMap with FilePath as key would return wrong
entries when comparing paths with and without scheme/host.

Change-Id: Icc5d119a18c1b7a2fdab9c89f162c48859926523
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-09 10:21:11 +00:00
David Schulz
5328674479 TextEditor: simplify SyntaxHighlighterRunner interface
Change-Id: I6c8d51d8dccc91514c89267eac2cea66c87a871a
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-02-09 03:37:22 +00:00
Robert Löhning
b163044648 SquishTests: Update expected output in tst_git_clone
Change-Id: Ia0a559ee8fb24d639b913dabc1b77dd4c2286fbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-08 12:31:51 +00:00
David Schulz
eb95794e67 Debugger: Fix std string view dumper test for msvc
Cdb always report the type name with all typedefs resolved so we have to
check the original type name for cdb.

Change-Id: Ib7166276075b18e011ea786a5d3468db0e24e9c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-08 08:46:36 +00:00
Eike Ziller
ef6f8df26d Merge remote-tracking branch 'origin/13.0'
Change-Id: Ica486867e95e4cfc98272cd34781ce770690fa17
2024-02-07 12:53:07 +01:00
Eike Ziller
2ea3f5382b Merge remote-tracking branch 'origin/12.0' into 13.0
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: Id7ac4d8b397cc20356cfbe30abcf43f53c4d2ff4
2024-02-07 12:22:50 +01:00
Michael Weghorn
941ad80d60 Debugger: Add debugging helper for std::string_view
Add debugging helpers for std::string_view,
std::basic_string_view and std::u16string_view
and add a corresponding dumper test for them.

With this in place, values of the local variables in the
"string_view.cpp" sample program from QTCREATORBUG-25865 are
shown as expected on both, Linux with GDB or LLDB and with
an MSVC build with CDB on Windows.

Fixes: QTCREATORBUG-25865
Change-Id: If8959e3225d9ce7f427a65ff6f1f134d3ad48e91
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-07 07:47:13 +00:00
Jarek Kobus
b6a6480084 LookupContext: Replace QSharedPointer with std::shared_ptr
According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews
QSharedPointer impl is poor and it's going to be removed from Qt 7.

Change-Id: Ia7ec4b427c5971d6bd375659b291a9aad2ead253
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-06 11:03:16 +00:00
Eike Ziller
91fa962647 Merge remote-tracking branch 'origin/13.0'
Change-Id: I93b7f87dee16a6897193f3cd2acbe7e1f03ec6a8
2024-02-06 10:14:09 +01:00
Robert Löhning
a0bd498b31 SquishTests: Explicitly require needed tools
Change-Id: I3682a01e97495ad8bc53f7cca033f91c9e0df8b5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-06 08:07:44 +00:00
Knud Dollereder
8b97598011 QmlProjectManager: Add new cmake generator
Automatic cmake generation can now be enabled by setting
the qmlproject property enableCMakeGeneration to true

Change-Id: I98523a9479d0cd812e43a9bd0b700120358260f6
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>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2024-02-05 16:21:24 +00:00
Jarek Kobus
f193aeed47 CPlusPlus: Replace QSharedPointer with std::shared_ptr
According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews
QSharedPointer impl is poor and it's going to be removed from Qt 7.

Change-Id: Id3228355c2883f9229cff3f878655736cc47204a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-02 15:56:25 +00:00
Eike Ziller
02ee8b183e Fix some compiler warnings
Unused lambda captures, unused private field, missing override.

Change-Id: I8b1d9d40af87fdfbd449841e9f112aad4682d8c5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2024-02-02 08:18:03 +00:00
Eike Ziller
a7a06d6f79 iOS: Move launch result from devicectl to a function
And add a test to document what we expect from devicectl.

Change-Id: I1a7f03c50393b99eddb2bfd34b5857e15b28d0a7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-02 08:13:27 +00:00
Eike Ziller
e32d3da321 iOS: Move process id gathering from devicectl to a function
And add a test to document what we expect from devicectl.

Change-Id: Ic69af99a472976a6c06801a646af59f8139d5624
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-02-02 08:13:15 +00:00
Jarek Kobus
05c6cffd6b TaskTree: Fix NestedParallelError test flakiness
Increase relevant timeouts.

Change-Id: I80fae036f41f3fef2c38345b86d160a2a9c62d6c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-01 16:28:01 +00:00
Jarek Kobus
5cf639341e QrcParser: Replace QSharedPointer with std::shared_ptr
According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews
QSharedPointer impl is poor and it's going to be removed from Qt 7.

Change-Id: I557804bf781b7fa58129242bd94e1566ed3ee304
Reviewed-by: hjk <hjk@qt.io>
2024-02-01 13:25:00 +00:00
Christian Stenger
293297269f Tests: Provide example tasks file
Change-Id: I529102dba9cd259de25d69a527e3ac2a0e1a9380
Reviewed-by: hjk <hjk@qt.io>
2024-02-01 11:17:42 +00:00
Jarek Kobus
0890ad05b2 Spinner: Add SpinnerWidget
Move it from spinner example and make it a reusable widget.

Change-Id: I3d74ec491f5d1cb7d012551f624cff2c618952ca
Reviewed-by: hjk <hjk@qt.io>
2024-02-01 09:29:58 +00:00
Alessandro Portale
7d659b446d Utils: Introduce StyleHelper::uiFontLineHeight
The "Text tokens" which are defined in Figma have an additional line
height value.

This change adds a getter function for the line heights.

Change-Id: I9513ac2f689292baf6e2c0a52fca8a1ec7f14dc1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-31 20:06:14 +00:00
Alessandro Portale
03db2fd6c5 Utils: Add two fonts to StyleHelper::UIElement
Change-Id: I0b4ff271ef9fe91eb369c916ad886c7d39c2e060
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-31 20:06:05 +00:00
Alessandro Portale
4d56f9b840 Utils: Improve metrics handling in StyleHelper::uiFont
Figma designs have font sizes defined in pixels. We want to
define font sizes in points.

This change introduces the original font pixel size values from Figma
and provides the conversion to sensible point sizes.

Change-Id: Ic8356942a9bc033d2b5cd62863d2bd0a4cc6973b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-31 20:05:52 +00:00
David Schulz
d651d8b41f GlslEditor: Fix crash in GlslHighlighter
since the async highlighter implementation the parent is not a
TextDocument anymore, but a QTextDocument. Pass the required mimeType
via the SyntaxHighlighterRunner now to the SyntaxHighlighter.

Change-Id: I0afcbe68719195649b4b7040416a743cb01214df
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-01-31 13:15:44 +00:00
David Schulz
f4b3b85fee TextEditor: Merge Base- and ThreadedSyntaxHighlighterRunner
Change-Id: I38ad01a895eabba99b2e554f3ae9bef85f32bb3b
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-01-31 10:20:56 +00:00
Jarek Kobus
728c03ca7c Async: Disable onResultReady test
To be enabled again when QTBUG-119169 is fixed.

Task-number: QTBUG-119169
Change-Id: I0a889faf3726d53ced11cecfc7c569f6aaa6ffd5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-31 08:49:39 +00:00
Jarek Kobus
8a94c7c758 Process: Fix runBlockingSignal() flakiness
It may happen that textOnStandardOutput() sends multi lines,
even when they were sent by two separate std::cout with std::endl.
Instead of checking whether the 2nd expected line starts with
the magic word, check whether the message contains it.

Limit timeouts so that the test should pass about 3 seconds faster.

Change-Id: Ie4e4df70b62854eb595d41272fe4fa9bdec606fc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-30 16:56:32 +00:00
Jarek Kobus
0df72f88c5 Process: Fix flushFinishedWhileWaitingForReadyRead() flakiness
The apparent reason for the flakiness was a time limit of the test.

Change-Id: Idddc8c161f9969522b2eed8317bbda4f59091dd9
Reviewed-by: hjk <hjk@qt.io>
2024-01-30 16:56:24 +00:00
Eike Ziller
2898e09bb4 iOS: Move app URL gathering from devicectl to a function
And add a test to document what we expect from devicectl.

Change-Id: I2f5312ebadef60239b77308acb7114f1d55143b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-30 10:06:29 +00:00
Eike Ziller
15baf18911 iOS: Move info parsing from devicectl to a function
And add a test to document what we expect from devicectl.

Change-Id: I395171bb5316c21b461a01dce5c9ec87d81fb0c4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-30 08:38:03 +00:00
Eike Ziller
a9a5972a9f iOS: Add some autotests for devicectl error parsing
Change-Id: I641f0c86b30a11ca6321db88afbf2969b4863972
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-30 07:56:31 +00:00
Marcus Tillmanns
dbee11f5b4 Environment: Fix incorrect usage of appendOrSet
appendOrSet will append to existing environment variables which is not
what we want for all the changed locations in this commit.

Change-Id: Icf6b110acc59261659839375672943ec21923da1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-01-26 10:33:34 +00:00
Marcus Tillmanns
a25bbf23c6 Utils: Fix error prone default value of appendOrSet
It was not readily clear that Environment::appendOrSet/prependOrSet
needed a value for "sep", otherwise it would just concat the values without separator. This got apparent when looking at usages of
appendOrSet.

Instead there are now three options, "Auto", "Colon" or "Semicolon"
with the default being "Auto", which determines the separator based on
the Environment::OsType.

Usages of appendOrSet and prependOrSet are also fixed with this commit.

Change-Id: I868e14ce38f50be9cd07292fe3f22663a62d116d
Reviewed-by: hjk <hjk@qt.io>
2024-01-26 10:10:03 +00:00
Jarek Kobus
5ae37f2f84 ImageScaling: Reuse LoopList
Instead of LoopRepeat + container capture.

Change-Id: Ic37c4ff53c4ce2a217a258aa4af1272ac3d8ab29
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-26 07:51:27 +00:00
Jarek Kobus
983fc4bcf6 TaskTree: Rename stop() -> cancel()
This better corresponds to done handlers called
in this case with DoneWith::Cancel.

By the way, get rid of unused LocatorFilter::stop().

Change-Id: Ie4246b8d888fff95940a2ed41367d2817bd6339c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-25 09:26:12 +00:00
Jarek Kobus
acf42bf90d Utils: Add synchronizedvalue.h into cmake and qbs
Amends 35a2d598ab

Change-Id: I64d76896c8bfbe4b48e2593118b209e3ae187a87
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-25 08:52:05 +00:00
Jarek Kobus
359ab928b1 TaskTree: Add tests for Group's CallDoneIf
Change-Id: I7140c1c7e28f6f503520ad05e6dcd613dcec2df3
Reviewed-by: hjk <hjk@qt.io>
2024-01-24 11:52:40 +00:00
Jarek Kobus
10ff747a0f Use more std::chrono and std::chrono_literals namespaces
Change-Id: Ib8c83988d7afe35d81b87ff8c5c87eef2082f12d
Reviewed-by: hjk <hjk@qt.io>
2024-01-23 09:32:43 +00:00
Jarek Kobus
63fc22e274 Process: Change signature of waitForXxx() functions
Change the arg to QDeadlineTimer type.

Change-Id: Id3dee0717e44130c16baf7925e5b06346a1a1ad1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-01-23 07:09:22 +00:00
Jarek Kobus
afc67468e6 Process: Get rid of setTimeoutS()
Add an extra arg to runBlocking() function instead.
Use std::chrono::seconds for timeout.

Change-Id: I7c3c21e8f26a2ccbed157d15083d6ef0b4cd2f7e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-22 20:27:51 +00:00
Jarek Kobus
f6be85b1d2 Process: Refactor timeout handling
Rename ProcessResult::Hang into Canceled.

Change the behavior of the Process:
Whenever the terminate() or kill() is called, including
indirect calls through stop() or runBlocking()'s timeout,
mark the process result as Canceled.
In this way the Process running by a call to start()
may also finish with Canceled state. Before it was only
happening for processes started via runBlocking().

Adapt the runBlockingStdOut_data() test accordingly.

Get rid of ProcessInterface::m_canceledByUser field.
Use ProcessResult::Canceled state instead.

Fix existing 3 usages of m_canceledByUser field.
Use standarized exitMessage() method for them.

Add automatic measurement of process execution.
Introduce processDuration() getter.
Use it for reporting exitMessage() instead of timeoutS().

Change-Id: I1a68559ce844caef863a97a6b0577b0238011f70
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-22 20:27:38 +00:00
Jarek Kobus
290121bc21 Process: Use more rawStd{Out,Err} const methods instead of mutable ones
Avoid using readAllStandard{Output,Error} mutable methods if possible.
Use non-mutable methods when we are not connected to
readyReadStandard{Output,Error} signals.

Change-Id: I2e830e571b9eab2177fd856bbe06dfc5137d9c01
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-21 17:21:25 +00:00
hjk
d234e71643 All: More ToolChain->Toolchain renamings
And removal of one unused function declaration.

Change-Id: I594e23401d8f247d3be081ce850005574951899d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-19 10:29:33 +00:00
Eike Ziller
2865f6eae0 Examples: Read and handle "documentation dependencies"
Some examples are defined in a Qt module (and therefore examples-
manifest), but have dependencies on other modules.

The example-manifests contain a `module` attribute for their
`instructionals` tag, and examples can contain "docdependencies" items
in their meta data, which are comma-separated lists of these module
names. Read the `module` attributes (the meta data is already
generically read) and check if the current set of examples-manifest
contains all required ones for an example. Hide it, if not.

Task-number: QTBUG-120759
Change-Id: Ib8ff80cf8a13965e57b5c4317e5d121c4127278b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-01-19 09:44:53 +00:00
Tim Jenssen
4e16d1a07d Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I264d3ce1a2d568c9f68c12c9ecd58fefd4c672a5
2024-01-18 11:08:33 +00:00
Jarek Kobus
79395e9df4 DataExchange example: Reuse TaskTreeRunner
Change-Id: I9075dca4c121f0a6041087bc8407569308135614
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-15 10:20:40 +00:00
Jarek Kobus
f63d31daa2 Demo example: Reuse TaskTreeRunner
Change-Id: Ia083a2317647c26886b9f483e5ae411e1e51c983
Reviewed-by: hjk <hjk@qt.io>
2024-01-15 10:17:07 +00:00
Jarek Kobus
7c3e8b420e ImageScaling example: Reuse TaskTreeRunner
Change-Id: I727a961bcfca20ebc0584b1ddeeaa412aff63335
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-15 10:16:29 +00:00
The Qt Project
d9557e5d55 Merge "Merge remote-tracking branch 'origin/12.0'" 2024-01-15 08:46:40 +00:00
Eike Ziller
a819a2bd9f Merge remote-tracking branch 'origin/12.0'
Change-Id: I62eb6d73b3ed59d0dd9760fc1921e353c993c166
2024-01-15 09:36:58 +01:00
Jarek Kobus
14f6954026 TaskTree: Disconnect from task's done() signal on destruction
If a task or task's adapter sends done() signal directly
from the destructor (which isn't really desired),
ensure we disconnect from this signal beforehand,
otherwise this may start invoking normal handling of task done()
and interfere with the destruction.

Fix NetworkQuery d'tor.

Add a test for it.

Add some TODO items.

Fixes: QTCREATORBUG-30204
Change-Id: I56a34d0f00c961c15bd1bcffef45520a4be5bce0
Reviewed-by: hjk <hjk@qt.io>
2024-01-15 08:29:57 +00:00