Commit Graph

62421 Commits

Author SHA1 Message Date
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
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
hjk
480da99508 Squish: Inline deletesymbolicnamedialog.ui
Change-Id: I668d3ff676c2af96b01b3c1baaf7d312f5a91423
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-13 08:08:31 +00:00
hjk
074282cae4 Todo: Inline todoprojectsettingswidget.ui
Change-Id: I942d1687a6a34a269ce4abd9233975febb4516e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 08:08:21 +00:00
hjk
e96b5c152b Squish: Inline opensquishsuitesdialog.ui
Change-Id: I18b322fe8b21b481f0289295df1c3cfff6f60473
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-13 07:36:07 +00:00
Jarek Kobus
d1c98e43b5 TextEditorWidget: Fix createMimeDataFromSelection()
When omitting separator lines take the selection start
position instead of the position of the block where
selection starts.

Amends c98bd449523dc05f8875e96d06cf7c21e18eef0d

Fixes: QTCREATORBUG-27813
Change-Id: I6067a3ef6396d50162d8e253fe4a825d47d326b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-13 07:23:07 +00:00
Eike Ziller
11b0cab178 Project settings: Fix missing IDs for global settings links
Change-Id: Id99bf5f9d45dd399c589011ca724914046305c53
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 07:19:27 +00:00
Thomas Hartmann
e5906945ce QmlDesigner: Add more info to RemoveNodeRewriteAction
Change-Id: I3ace796f81580f1eda1359a244c5e5bee3b01ac5
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-07-13 06:50:21 +00:00
Christian Stenger
915cfc93d9 Squish: Remove unused capture
Change-Id: Icef1df3f8e708a0192d8eaa176ed6202e2fa3ae9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-13 04:29:59 +00:00
Marco Bubke
5c4a5126d6 QmlDesigner: Move synchronization types into extra namespace
Change-Id: I4f0574fcdcd5df4c0122028d1b032e910a9e28b6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-12 19:53:14 +00:00
Marco Bubke
e6617f520c QmlDesigner: Provide local propertries
It returns all local propeties in a sorted order.

Task-number: QDS-7276
Change-Id: I030d63b64e66b0c06b33904e5b157ed8aa060ae5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-12 19:53:08 +00:00
Marco Bubke
e7a013cbfc QmlDesiger: ProjectStorage provides properties for typeId
It returns all properties of the type and the prototype chain in a
sorted order.

Task-nubmer: QDS-7276
Change-Id: I95c16abd16d9d0f1fdf68d3425780a888dc056b7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-07-12 19:53:01 +00:00
Thomas Hartmann
57413c6703 QmlDesigner: Add rect to invalid ids
Change-Id: Ie80552dbe85d4658711b3906f1b3819cf7a4f8ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-12 18:34:18 +00:00
Jarek Kobus
0490e3426d ShellCommand: Merge VcsCommand::VcsRunFlags into RunFlags
Use ShellCommand class name in signal-slot connections.

Change-Id: Id50ee6887708558a2ba0972ece6c420b0be36f72
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 14:49:10 +00:00
Jarek Kobus
e3da02248a ShellCommand: De-virtualize runCommand()
Add virtual postRunCommand() method, called
by the end of runCommand().

In this way the rest of the API of VcsCommand remains
an implementation detail.

Change-Id: Ia4149334bd39a1448266d2406e0987bee07a9c58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 14:49:00 +00:00
Jarek Kobus
8bc6cf3f98 Fix the runtime warning when building against Qt 5
It fixes the following warning:
QObject::connect: Cannot queue arguments of type 'FilePath'
(Make sure 'FilePath' is registered using qRegisterMetaType().)

It looks like with Qt 5 all arguments needs to be specified
with full namespace in order to be used in queued connections.
Note, that warning is misleading as adding qRegisterMetaType()
doesn't fix it in this case.

The full scope isn't needed when building against Qt 6,
so leaving a TODO for Creator 9.0

Change-Id: I43a52385b8d3bb0ef90ce274e11df9fd68e62109
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-07-12 14:33:37 +00:00
hjk
3de1fffbeb ImageViewer: Convert to Tr::tr
Change-Id: Id12dc265ed60be942ec68ac5a80f57144c2d086f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 13:37:00 +00:00
hjk
4a9b74c670 Todo: Inline optiondialog.ui
Change-Id: I55f170220a075e4d8db86f17eb857325a33bf82c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-12 13:36:34 +00:00
hjk
2234bab8ae Todo: Inline keyworddialog.ui
Change-Id: I0e571b4cab0bcbc540a7710e2ee0b6253af0f532
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-12 13:14:35 +00:00
Tim Jenssen
b888c67f0c qmldom: resolve missing dependency if WITH_QMLDOM is enabled
Task-number: QDS-7257
Change-Id: I51045a40108865174491dc55fa1536399b309bd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-07-12 12:58:27 +00:00
Eike Ziller
04065603a1 Help: Inline docsettingspage UI
Change-Id: Ifd4b44ba248f1e4b696477eb127a102762d9fbd9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-12 12:33:33 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Christian Stenger
d1dbff3e6f Squish: Pimpl plugin
Change-Id: I69edca0307d190f62a92012170df93dbb84434f9
Reviewed-by: hjk <hjk@qt.io>
2022-07-12 11:47:49 +00:00
hjk
4da20913bb Qnx: Inline QnxDeployQtLibrariesDialog
Change-Id: Ia3b31ab630affc2069831ed377bc8c1bb19aa410
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-12 11:34:56 +00:00
Eike Ziller
a85e19cf19 Help: Remove code paths supporting old filter engine < Qt 5.15
Change-Id: Ie3008ac78294f8831c22e73aa325e1da3b4016f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-07-12 11:24:39 +00:00
Jarek Kobus
cea7be0486 VcsBase: Remove some ssh related methods
Remove VcsCommand::m_sshPrompt, as it is always taken
from settings.

Change-Id: I9f46bb5a9de03e907f2098ca72a647c969e55a27
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 11:04:29 +00:00
Jarek Kobus
975baf23ac ShellCommand: Make processEnvironment() protected
Rename it to environment().

Change-Id: Ib393ea09d324cbd86b0b74ac928fcb37f243f8fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 11:04:23 +00:00
Marcus Tillmanns
78e7c7b2a6 docker: Fix run environment setup
When starting a debug session the systemEnvironment() was used
as the basis for the debugger process. If the docker device
did not have the same shell installed as the host, this would
break gdb as the SHELL= env variable might point to a
non-existing shell binary.

Change-Id: I7253ad3c4995eed857279146f1b258febe1ca710
Reviewed-by: hjk <hjk@qt.io>
2022-07-12 10:43:43 +00:00
Marcus Tillmanns
b8f66276fd docker: Fix executable aspect selector
The desktop run configuration used the wrong selector
when creating the ExecutableAspect. This meant that
the executable would always  try to run on the host
instead of in the docker container.

Change-Id: I10861c2115edeeab95d4931ba118afd83cdf1337
Reviewed-by: hjk <hjk@qt.io>
2022-07-12 10:36:22 +00:00
Tim Jenssen
d6c10e775d qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6
Task-number: QTCREATORBUG-26600
Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-12 09:20:04 +00:00
Thomas Hartmann
086de6f896 QmlProject: Allow only one project in QDS
This keeps project management simple. Having multiple projects
open often leads to confusion.

Change-Id: If6344732cf2813ea8ccf6a1a790229d1038ec240
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-07-12 08:42:33 +00:00
Christian Stenger
a74582a9d3 Fix qbs build
Amends b338405477.

Change-Id: I2b63dacba611b24fa9df45dd707484b1de1a3233
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-12 07:36:35 +00:00
Jarek Kobus
9306ad61d2 ShellCommand: Make setDisableUnixTerminal() protected
Change-Id: I5283aeff27bc757b0a840bc2a080839172c7d0c6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 07:35:58 +00:00
Jarek Kobus
7ddbaadcb6 ShellCommand: Remove unused lastExecutionExitCode()
Change-Id: I7af626ee6b6332bb88a3fcc661e4f67f1d6063de
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 07:35:53 +00:00
Jarek Kobus
7d9a3339d1 ShellCommand: Remove unused lastExecutionSuccess()
Change-Id: Ie518e6c45db1bc509f40be45925ae32b3d5bc180
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-12 07:35:46 +00:00
hjk
967136b07a Qnx: Search pdebug on the device again
The responsibility for creating "global" paths has shifted lately,
and the Qnx debug support forgotten to adapt.

Task-number: QTCREATORBUG-27798
Change-Id: I940502eb64303babbea3bfafe845a02542a0a6d5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-12 06:55:12 +00:00