Commit Graph

62421 Commits

Author SHA1 Message Date
Alessandro Portale
34213f5717 Tracing/QmlProfiler/PerfProfiler/CtfVisualizer: Remove pre Qt 6.2 code
- Remove code for Qt below 6.2 from c++ sources and CMakeLists.txt
- Remove Qml code from .qrc files
- Qbs: Add qt.core.resource_data Groups for Qml code
- Remove OpenGL shader .frag and .vert files
- Remove Qml import version numbers

Change-Id: I3bd1cd95381e66c98ee3af4259e89b0b1eff0709
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-18 07:11:06 +00:00
Alessandro Portale
8ad4acdd30 Android: Don't quote log lines with path names
Change-Id: I70f23af46bd6c8318971b20727e4010889bdcebc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-07-17 11:11:45 +00:00
hjk
71ec25895f Utils: Centralize adding layoutitems in LayoutBuilder
As a side-effect, this fixes adding stretch and space in the the dummy
vboxes for formlayout fields with more than two items that was
accidentally missing before.

Change-Id: I18e4755ccd3cd9e1de761b70dc621b17376277dc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-15 12:05:08 +00:00
hjk
11deab03a9 Utils: Set up form layout buddies automatically in LayoutBuilder
Change-Id: I79e523f7847258a43ffe263f80c52983651aa34d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-15 10:11:59 +00:00
hjk
2b3386908a app: Adapt to Qt >= 6.2
Change-Id: Ia27bccff16f0ba41e18c72ffd950b15e800fcf47
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-15 10:11:47 +00:00
hjk
0108c48463 Utils: Adapt fake TipLabel to Qt >= 6/2
And fix a warning about some stack-allocated offsetsAndSize member going
out of scope.

Change-Id: Icfd1de121cb951783a96f8195c3160c65c405cd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-15 07:12:14 +00:00
hjk
d83eb0494a Use setClipboardAndSelection more broadly
Basically everywhere besides the EmacsKeys plugin.

Change-Id: Iaf2a0a5d791b5b3dd6df2c05c1b862516630d3f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-15 07:06:25 +00:00
hjk
a5cb967704 Help: Adapt to Qt >= 6.2
Change-Id: I8529b33c597ab3ea795a6ac599f6f52ae36fce50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-15 07:06:12 +00:00
Marco Bubke
21b8186108 Help: Fix missing header for TR
Change-Id: I8f94ca9ff81ec7d4d2c902d7a28b771259ca33ec
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-14 15:56:48 +00:00
Jarek Kobus
a640a6ae8c VcsCommand: Don't derive from ShellCommand
Transform VcsCommand into VcsCommandDecorator and
attach it to ShellCommand. There is no need to derive
from ShellCommand anymore.

Use ShellCommand's public API to setup vcs command via
VcsCommandDecorator.

Make ShellCommand final.

Change-Id: I39e3699c80a9e108bcaeef7fb02214e2cc0d0dee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 14:19:33 +00:00
hjk
a1588918b3 Utils: Adapt ProcessHelper to move to Qt 6.2
And move constructor out-of-line.

Change-Id: Iab92dbef56d60f2ec2d19b778fd968834dd72766
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-07-14 13:57:49 +00:00
hjk
775aa8f9e5 Utils: Fix doCleanPath()
QString::right() != QString::mid(), except for very special cases.

Change-Id: I0b4d8e46b7631975dd1c3c38b50f4f336bff3f2e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 13:24:49 +00:00
hjk
472f62734d Core: Also set selection from context menu actions
Change-Id: I1198cd20705c01e5025775a0aa0431fe0d198ffe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 13:20:09 +00:00
Jarek Kobus
e6001ae2a0 AppOutputPane: Update buttons after stop was initiated
Otherwise it's possible to quicky press the stop button
again before the process actually finishes and this leads
to inconsistent state transition, resulting in assert
being triggered.

Change-Id: I4618a00cb9cea666992bc9ee6b60b3b3a0d9a8b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-07-14 13:12:56 +00:00
hjk
fb3d3da156 Autotest: Inline testsettingspage.ui
Change-Id: I9cf2b9da84447abfa3fc2d34a9baa0724b40dcaa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 12:41:28 +00:00
hjk
3007b990e5 Debugger: Load dumpers from the device that runs gdb
... not from the device of the inferior.

Amends 12bc192422.

Change-Id: Ief34d1765d48e87a9098522bafb4b419a857c42e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 12:41:10 +00:00
hjk
57ce33bc4e Docker: Move to Tr::tr
There were no strings in the .ts files yet.

Change-Id: I86e7edace45db796fc3cc80d2735d1a80b897c85
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 12:40:57 +00:00
Marco Bubke
4ca769afb1 QmlDesigner: Add ProjectStorage::functionDeclarationNames
As we changed the MetaInfo interface we can return ids too but as an
intermediate step we return the sorted function names. Beware that the
sort is not matching the normal SmallString "<" operator because it is
not using size.

Task-number: QDS-7284
Change-Id: I96c6494d7c36f37d451d439be8aee35e0221f20b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-14 12:16:42 +00:00
Marco Bubke
63243aabc1 Use compare opertators from string_view
Change-Id: I9da78dd15a6696a7061342cc1b1f1571eba74f19
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-14 12:07:46 +00:00
Marco Bubke
2860e033ad QmlDesigner: Add ProjectStorage::signalDeclarationNames
As we changed the MetaInfo interface we can return ids too but as an
intermediate step we return the sorted signal names. Beware that the
sort is not matching the normal SmallString "<" operator because it is
not using size.

Task-number: QDS-7283
Change-Id: I767a4d9f589d2bb2d2e29788be90d29dbd5ac1e3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-14 12:07:08 +00:00
Marco Bubke
f6ba4bc603 QmlDesigner: Add ProjectStorage::propertyDeclaration
Returns for a property declaration id the property declaration infos. If
there are no infos a null optional is returned.

Task-number: QDS-7278
Change-Id: I4faa158008130f00f31062bab94baa7f88d70edf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-14 12:06:43 +00:00
Marco Bubke
d6d752e6ca QmlDesigner: Move PropertyDeclarationTraits
Because it is shared between different namespaces it is moved to the
parent namespace.

Change-Id: I43186bfa3b1b1d6bf95158aaf13b06e0c6bd64b5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-14 12:06:26 +00:00
Marco Bubke
f31d0f3a0a QmlDesigner: Provide ProjectStorage::localPropertyDeclarationId
Even if there is a property with that name in the prototype chain an
invalid id should be returned.

Task-nubmer: QDS-7281
Change-Id: I08611390c8e9a75036ed5d5b54d2e5637adcfd84
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-14 12:06:17 +00:00
Marco Bubke
dac7cca02b QmlDesigner: Add ProjectStorage::propertyDeclarationId
The properties has to respect overloading. So it should chose the
nearest property declaration with the requested name.

Task-number: QDS-7280
Change-Id: I13ff9cf1f9389ec6b48c6e692368ef33795b61fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-14 12:05:53 +00:00
hjk
d842862944 Utils: More porting.h related changes
Change-Id: I528a6950dfa6e09eb7f7ada265c8c41dba816bfd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 12:04:25 +00:00
Eike Ziller
4adf6c833d Android: Don't show message boxes in non-GUI thread
Delay them to the GUI thread.

Task-number: QTCREATORBUG-27369
Change-Id: I2879de69ec1756ad55d3ae3aba8e233138bf3ed1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-14 10:45:41 +00:00
Jarek Kobus
06023df8be VcsCommand: Move the class into vcsbaseclient.cpp
No need for a separate header.

Change-Id: I870ea0d9547829037644d79a286d87d4c77dc4ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 08:57:21 +00:00
Jarek Kobus
cb9ead8c8d VcsCommand: Remove m_preventRepositoryChanged field
Disconnect the appropriate connection instead.

Change-Id: Ie5cd8b3bcbab526aa770c493a465c9cdb07437f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 08:57:14 +00:00
Jarek Kobus
b1e46d735f SubversionPlugin: Switch arguments in runSvn
To make it more convenient. Replace timeoutS
arg with multiplier to the default timeout taken
from settings.

Change-Id: I4a318c113a9a6895159ee803942142a9d0524182
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:54:24 +00:00
Jarek Kobus
ca3362952a ClearCasePlugin: Introduce s_verboseRun helper
Change-Id: I08abc4f45ee17574e9a642f5b971fc8278e02ab0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:47:03 +00:00
Jarek Kobus
2e2592ac06 SubversionPlugin: Introduce convenient s_defaultFlags
Change-Id: Ic8b91eea66703541bab73218ac738c4b9cc250d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:44:29 +00:00
Jarek Kobus
85bf11a7af CvsPlugin: Introduce convenient s_defaultFlags variable
Change-Id: Id87acec45e4822f53d5e1ac78a3485cbe5c2a285
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-14 07:44:22 +00:00
Jarek Kobus
84de21b702 VcsCommand: Don't store the FutureProgress
Amends 9891a879aa

Change-Id: I164eda5935847343bf76bfbcf650ba372ccb6681
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:39:50 +00:00
Jarek Kobus
197ad524a6 ShellCommand: De-virtualize postRunCommand()
Provide runCommandFinished() signal instead.

Change-Id: I7c5e7d4aa484a7248dc369880343996e18c7c4b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:39:44 +00:00
Jarek Kobus
c7f24f9f13 ShellCommand: De-virtualize addTask()
Provide executedAsync() signal instead.

Change-Id: I8f04dc90875e5f27827ea553a9f23f41656cc4db
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-14 07:39:37 +00:00
Thomas Hartmann
f98ed790a1 QmlDesigner: Start to Use NodeMetaInfo in ReadingContext
We keep the old code path for now and throw an exception
if there is a divergence. The old code path is supposed
to be removed before the 3.6 release.

Change-Id: Id5458cdb452341295c5901caf706d224e57837b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-07-14 07:02:52 +00:00
Jarek Kobus
85071d8e8d ShellCommand: De-virtualize environment()
Provide instead a protected setter, used in VcsCommand c'tor.

Remove a forceCLocale arg from setProcessEnvironment() method,
as it is used only in VcsCommand context when
ShellCommand::ForceCLocale flag was set. Move setting
C locale env directly to the shell command, just before
the command is executed, so that we are sure the flag
was already set.

Modify env directly in VcsCommand c'tor with regards to
SSH_ASKPASS variable.

Change-Id: Icff555ade4984368f7ce79f762d1bb5d3614076a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-13 19:29:10 +00:00
Tim Jenssen
68bb3b99a9 tracing: get rid of Qt5 code
Change-Id: I31205ed7c70de4617575f2d05065d47183bd222f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 17:13:46 +00:00
Fawzi Mohamed
fd89043de2 qmljs: (QString -> Utils::FilePath)++
convert more QString containing paths to Utils::FilePath

Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 17:13:23 +00:00
Yasser Grimes
0bb272d411 McuSupport: Use System header paths in module mappings
Previously only HeaderPathType::User was allowed for mappings when the
headers and qml files are joined (the case for Qul), but "Qul QtQuick
include" is of type HeaderPathType::System causing the import not found
error in QTCREATORBUG-26751

Task-number: QTCREATORBUG-26751
Change-Id: Ie40ad32c77bb00ad2c01fd1ae28330669db1e785
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 16:12:51 +00:00
Jarek Kobus
0da525d65c VcsBase: Cleanup some Utils:: in cpp files
We are using namespace Utils in these files.

Change-Id: I0526f7e4fff2fe0d24d1e2b9fa087298d5331955
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 16:01:35 +00:00
Jarek Kobus
89e7201048 VcsBase: Hide VcsCommand class
Make it an implementation detail.
Introduce VcsBaseClient::createVcsCommand() method instead
for instantiating VcsCommands.

Replace all occuriences of VcsBase::VcsCommand in public API
with Utils::ShellCommand.

Change-Id: Ie438cc3a5e867b3ee8f9e935b56b2f16ea453f8a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-13 16:01:28 +00:00
Thomas Hartmann
aeea22257c QmlDesigner: Add support for Behaviours
A Behavior will be added as a normal ModelNode to the default
property, but we store the property name in behaviorPropertyName.

The value of behaviorPropertyName cannot be changed after the
ModelNode was created, since I do not see any use case and it keeps
things simple.

Change-Id: I69ba1d4d706432cfbbd35b001238f623e6e0b4fd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 15:33:07 +00:00
Cristian Adam
c505d6a72e ClangTools: Use CtrlC Stub for clang tools on Windows
We got a report that using a clang-tidy would launch llvm-tokenizer,
which would not close when clang-tidy closes.

This resulted in zombie processes which would significantly
affect performance.

Change-Id: I1952be668b6352970cdb70c7fa622df77c2d175e
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 14:47:36 +00:00
Jarek Kobus
ec48545628 ShellCommand: Avoid code repetition on process setup
Move the common setup part into runCommand().

Change-Id: Ib17ef5fd89502f76e5cb03c1d5cb82c746c672a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 13:55:40 +00:00
Jarek Kobus
aebf6a9466 ShellCommand: Remove workingDir arg from 2 methods
Set a working directory for the process to run
before calling runFullySynchronous() or runSynchronous().
Make workDirectory() a private method.

Change-Id: I30f8354a3e409a06170f481cea4e97e3772da252
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-13 13:55:34 +00:00
hjk
01e75d8b63 Squish: Use LayoutBuilder on ObjectsMapEditorWidget
Change-Id: I5c6e32ba7a27584f54531c5aacbc627e98b729ba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 13:30:39 +00:00
hjk
764d8376ba QtSupport: Remove unused BuildLog dialog
Change-Id: I5202a0554d044d162d4c0723f591f7479dffff22
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-13 13:29:51 +00:00
hjk
9478a31a55 Squish: Convert to Tr::tr
Change-Id: If05727960ffa4181de6588e098c151072af43500
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 13:29:38 +00:00
Thomas Hartmann
3cba432750 QmlDesigner: Track MaterialBrowser usage
Change-Id: Idc70434ffaa633353e87b373660df03863db8d95
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-13 13:11:31 +00:00