Commit Graph

76860 Commits

Author SHA1 Message Date
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
Cristian Adam
5088781693 GitHub Actions: Use software OpenGL driver for tests on Linux
As done for the Windows configuration. macOS comes automagically with
a software renderer.

Change-Id: Ifa64fc80f9ce69b87fb589675e794ac3b537cc48
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 08:54:37 +00:00
Cristian Adam
9c09ade2ed GitHub Actions: Use software OpenGL driver for tests on Windows
Since some tests are failing due to missing OpenGL context, I assume
the GitHub Actions Windows runners do not have OpenGL drivers.

Change-Id: I7951f0906d37bc1d513e77540fdd379a71cbed60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 08:52:36 +00:00
Leena Miettinen
397ba273cb Doc: Update screenshots for iOS development
Task-number: QTCREATORBUG-27560
Change-Id: Ic5506bb60c2ae268dab09e52bb691e46a66dfa2e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-14 08:23:12 +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
Leena Miettinen
86c6d1d09d Doc: Describe new way to access global settings
From project-level To-Do and Clang Tools settings.

Task-number: QTCREATORBUG-27560
Change-Id: If91dfe81a87af3de3f6b52c160b8b1df4789c20b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 13:41:07 +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
Sergey Levin
4a1a0eaa39 Core: Close ICore::showWarningWithOptions dialog on pressing Esc button
Change-Id: Ic09202799bde9cb4fbc3ca4e9836ca0c0cc499f2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 13:03:33 +00:00
hjk
ab90298fde ToDo: Convert to Tr::tr
Change-Id: I2bd081fd484f851234c7e54114a15488271e0df1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 12:56:47 +00:00
hjk
3651c385b7 UpdateInfo: Inline settingspage.ui
Change-Id: I66a6305ea5c8485355b52321b7bba4216c8f7ad5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 12:45:23 +00:00
hjk
0d7e270852 Utils: #include <QUrl> in fileinprojectfinder.h
Needed for MSVC:
 C:\Users\qt\work\build\qt_install_dir\include\QtCore/qhash.h(111): error C2079: 'QHashPrivate::Node<Key,T>::key' uses undefined class 'QUrl'

Change-Id: Iafa83ea103fbb89744fc37ca4396e356d29be9bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-07-13 12:45:15 +00:00
Thomas Hartmann
1627acd659 QmlDesigner: Track MaterialEditor usage
Change-Id: Ie8daf34bf21d9b12711704be4fdea9b291307f02
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-13 12:42:38 +00:00
Eike Ziller
550a7ecc6e BuildConfiguration: Do not update environment cache in constructor
Updating the environment cache calls into the virtual function
BuildConfiguration::addToEnvironment (via BC::baseEnvironment()), and
that is not working in the constructor yet.

Move the call to updateCacheAndEmitEnvironmentChanged to
BC::doInitialize.

This fixes the build environment for the first CMake run on a newly
created project. CMakeBuildConfiguration::addToEnvironment adds the PATH
to the Ninja installation from the online installer. If that is missing,
CMake will fail with a missing build tool, if Ninja isn't found anywhere
else.

Amends 65e043961e

Task-number: QTCREATORBUG-27495
Change-Id: I7c952db9029ab78e0aa9ea267444af163f5941ac
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 12:32:03 +00:00
Eike Ziller
e2d5936a76 Help: Convert to Tr::tr
Change-Id: I3f9ca195488f7cc90e7f58eb15263dde1bc911c4
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 12:30:46 +00:00
hjk
d262e665ca ProjectExplorer: inline editorsettingspropertiespage.ui
Also removing the spurious extramargin.

Change-Id: Ic52c1afccd479a84fc7278b4d2cd4070bdc7193e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 12:21:46 +00:00
hjk
db7b523a94 CppEditor: Inline cppcodemodelsettingspage.ui
Change-Id: I97f27121714adaca00aaa1347d460968be395afa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 12:04:00 +00:00
hjk
81dfcb4859 ProjectExplorer: inline codestylesettingspropertiespage.ui
Change-Id: I8682685d554fce5d618da913d35720465ac52278
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 11:35:39 +00:00
Thomas Hartmann
c92216aea5 QmlDesigner: Add QML files from assets_imports
Otherwise they do not show up in the project explorer and
more importantly we do not generate the proper cmakefiles.txt.

Task-number: QDS-7279
Change-Id: Ib6cbd839cee2ec5ded09e57d2097b75f1a1e68e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-13 11:30:00 +00:00
hjk
04befed8c3 CppEditor: Inline cppquickfixprojectsettingswidget.ui
A practically empty grid.

Change-Id: I6d23794244519de4c019aab6530482e28de964c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 11:22:36 +00:00
hjk
b1f9cdac35 Qnx: Move to Tr::tr
Change-Id: I43b49d325a129c180869140c4ae1774f7f89d2fd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 10:52:18 +00:00
Eike Ziller
f19957c6dc Help: Inline generalsettingspage UI
Change-Id: Id67a4714aa09e19a2a97c2cb0fa641ddee0584e3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 10:30:28 +00:00
hjk
6f6d4015ea ClangTools: inline clangselectablefilesdialog.ui
Just a Vbox.

Change-Id: I27618d7ba9a22011dff8c3486a944fbbdaf90a1c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 10:19:18 +00:00
Thomas Hartmann
e43e08d77d QmlDesigner: Add lookup for alised types in NodeMetaInfo
Aliased types like T.Button require a special code path.
Those lookups are only required for the rewriter and are not used
by application code, since we strip the alias qualification.

Change-Id: Ic74c352655e640b063bb01f03a699182af506de7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-13 09:52:03 +00:00
hjk
802de0eb5e Utils: Collapse most of porting,h
Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-13 09:44:09 +00:00