Commit Graph

76686 Commits

Author SHA1 Message Date
Tim Jenssen
0d4dce4d7e qds: add QString licenseeEmail()
Change-Id: I3bf43e776358cd0a72b4761ce290addc2b832f60
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-08-29 14:58:18 +00:00
Christian Kandeler
7f7e54afb7 Restore perfparser submodule state
Was accidentially set to some ancient state in
a7956df3ca.

Change-Id: I987d45f459fffe6659eca960630c5c11b75ec609
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-29 14:01:40 +00:00
Piotr Mućko
3b07669850 McuSupport: Convert variables in JSON to qtcreator format
Change-Id: Iaa5abaf024495e14caded27400e1c2933e46854e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 13:44:07 +00:00
Eike Ziller
904c368858 Projects: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I2217f13336ec816d28bd447ccd14a405bff2a3a7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-29 13:39:16 +00:00
Alessandro Portale
c0f2fb9981 ProjectExplorer: inline projectexplorersettingspage.ui
Change-Id: Ia279c32a26f6e07d41fdff71b2f6c2b09075ac87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 13:20:21 +00:00
Alessandro Portale
a531a8c64e ProjectExplorer: inline devicesettingswidget.ui
Change-Id: I806fc291e0096c2dadb5489be32cde8f87b1e41b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 12:22:52 +00:00
Piotr Mućko
d76ba33381 McuSupport: unittests for legacy 3rd party package creation
Change-Id: I83e3daf1f718066b20798aae2cf19836529b1f56
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 11:50:50 +00:00
Alessandro Portale
cd08759fb6 ProjectExplorer: inline devicetestdialog.ui
Change-Id: I55ff1c6bc5f870268b8fd092a2e4472da49894c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 11:11:53 +00:00
Alessandro Portale
ce97bee8f6 ProjectExplorer: inline devicefactoryselectiondialog.ui
Change-Id: Ia89fe74552236ec6400e9dd08624279f55800945
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 11:11:44 +00:00
Christian Kandeler
607900ae17 ClangCodeModel: Fix tests
Amends a7956df3ca.

Change-Id: I7cbbd391ee015c5481e90ebdad356d9c6e916d5e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-29 11:10:28 +00:00
Piotr Mućko
d66b791df1 McuSupport: Use MacroExpander for variables evaluation
Change format of variables to qtcreator's internal:
From $Qul_DIR to %{Env:Qul_DIR}.

Change-Id: I3838593b979a0a9b7d85e77114b1b129e1a128da
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 10:46:59 +00:00
Mahmoud Badri
4e5673850c QmlDesigner: Allow adding imported 3D models using the context menu
Also some changes to support translation and avoid translation-related
issues.

Change-Id: Ie2cc491cf491ac4c14e12e8cf666d4b452b9e7c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 09:32:56 +00:00
Christian Stenger
dd2d05a772 Scripts: Fix permissions
Broke with a7956df3ca.

Change-Id: I072ea34183aedf2fd693af1bb589660aa06b9e1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-29 09:32:13 +00:00
David Schulz
49c29fedba Utils: do not escape '\' in assert backtrace output on windows
Change-Id: Ib01a29f572b79f3cc323ab69b70a63408aa46af8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 09:31:21 +00:00
Eike Ziller
55c627efef Android: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I159fb6928954240af742708efbd6776104c4631b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 09:12:37 +00:00
Eike Ziller
57745407de Clang/C++: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I7678b8e429b5eff79f87eb637f6f2131be43d904
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-29 09:12:20 +00:00
Eike Ziller
fe4e74af75 Adapt attributions to removal of Utils::variant implementation
Amends 84c1d6572b

Change-Id: I6cf02d577babb35537338447e4918776bd3012fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-08-29 08:21:05 +00:00
Alessandro Portale
15e0f37b78 Docker: Avoid extra margin around DockerDeviceWidget
Change-Id: I0235e3d3017142638387a8bc5976d51f9713cc32
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-29 06:17:47 +00:00
Christian Stenger
c37e5b9152 QmlDesigner: Fix Qbs build
Amends 35a773b2dc.

Change-Id: I684be86dfff78f2c284612975c5147f8af870c8d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-29 05:57:08 +00:00
David Schulz
6b6358178e Utils: print assert backtrace on windows
Change-Id: Ifd9753b22641547c16fb6843dc7a3cf5f5b7c86e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 05:41:36 +00:00
Orgad Shaneh
72e7130f12 Revert Qbs submodule to 1.23 branch
It was set to a very old commit by mistake in SPDX license change
a7956df3ca.

Change-Id: Ie4aef5cb4fadb321ec7a54a8c1ee24e3eddf0089
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-08-28 07:35:48 +00:00
Alessandro Portale
e070d826e5 ProjectExplorer: inline projectwizardpage.ui
Change-Id: I0c016e08c77b2029a1d024664dde6ae9e3187b3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 20:24:40 +00:00
Tasuku Suzuki
95edda95b4 Set ElideMiddle for the editor combobox
When Qt Creator opens more than one file with same name,
the path to be shown tend to long.
In this case last part (file name) is as important as first part.

paths in Locator and Open Document are elided in the middle of path
already.

Change-Id: I953a8068b50331f9ef20ad9efbd947b4dbcf0845
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 17:33:21 +00:00
Marco Bubke
da36459759 QmlDesigner: Refactor isSubClass
IsSubClass is renamed to isBasedOn and takes now NodeMetaInfo as a
parameter. But for most cases there are is... functions as short cut.
The model is providing shortcut NodeMetaInfos too. This is done in the
sake of caching.

Task-number: QDS-7445
Change-Id: Iff2dea66e253b412105427134bd49cb16ed76193
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>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 15:02:24 +00:00
Alessandro Portale
fa033876e6 QbsProjectManager: inline customqbspropertiesdialog.ui
Change-Id: I752c101dcdd1ee47880b43ffe61597bbdf67521f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-26 14:52:13 +00:00
Alessandro Portale
706a2af1e1 QbsProjectManager: inline qbsprofilessettingswidget.ui
Change-Id: I4e7d1663bac7d21d17092a3510165d6aaf093eed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 14:43:55 +00:00
Mahmoud Badri
184614c3d8 QmlDesigner: Cleanups for includes of edit3dview.h
Change-Id: I6219fe71c4c566e2fe68198bf2567835518acd62
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-08-26 14:35:41 +00:00
Tasuku Suzuki
f160b50bda QComboBox: not accept wheel events for changing values
It is dangerous for combo boxes within scroll views especially.

Fixes: QTCREATORBUG-28103
Change-Id: Ibed498658ce9d6f5b90f6d7e8ec7c4f2bbd015aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-26 13:08:53 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Miikka Heikkinen
169ba3b6f7 QmlDesigner: Convert the form editor preview image to correct format
We were passing the image with premultiplied alpha obtained from
QSGRhiLayer::toImage() to be shown in form editor. This corrupts the
colors in with 3D materials having partially transparent colors.
Converting the image to QImage::Format_ARGB32 format fixes the issue.

Fixes: QDS-7474
Change-Id: Id0b689d7e2d9fc111e98f28b18db0af3ac30041f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 12:19:43 +00:00
Marco Bubke
f6d71d61d7 QmlDesigner: is... function use project storage
Task-number: QDS-7379
Change-Id: I68e434b58b00aea94cdab9d86f38bfb779a2e6dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 12:18:51 +00:00
Marco Bubke
0982e668e7 QmlDesigner: Add isBaseOf to project storage
It return true if it is the same or a derived type. You can use multiple
base types.

Task-number: QDS-7424
Change-Id: I965a7c5b87ef0eb0183be1c705ebc18dee1943c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 12:15:58 +00:00
Marco Bubke
8a29c7da2f QmlDesigner: Add prototypes and prototypes+self getter
The ids are returned in order. There is no precedence between a
prototype or extension.

Task-number: QDS-7381
Change-Id: I38bce22067db93bbacaf9026c1dbb10363d2fb4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-26 12:15:30 +00:00
Marco Bubke
bba8cef73b QmlDesigner: Add extension to projectstorage
Types have not only prototypes but extensions too.

Task-number: QDS-7382
Change-Id: Iae39b69be7e2254d3ad156910cd2de8c9c5345cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 11:00:36 +00:00
Marco Bubke
b99bc1a055 QmlDesigner: Adapt PropertyMetaInfo::castedValue
It tries to avoid calls to propertyTypeName() because it is slow
and unreliable. Instead we use the builtin type ids. If there are more
common cases we should add more builtin type ids.

Change-Id: I7f6b6c4251fd275878c476526c75058a8580b4a7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 11:00:16 +00:00
Marco Bubke
c7b6d83f94 QmlDesigner: Add comon type cache
There are common types like QtQuick.Item or double which are needed for
a fast lookup.

Task-number: QDS-7380
Change-Id: Ibbdf77e2cc351fc56eeca3b96ac1b83a3feb83c9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
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-08-26 10:59:46 +00:00
Marco Bubke
35a773b2dc QmlDesigner: Use ProjectStorage
Task-number: QDS-7379
Change-Id: I50c8a4a527daa7268a723094b6ceec37d10dfaa6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 10:57:09 +00:00
Marco Bubke
84e3ffeaba QmlPropjectManager: Fix ownership
Explicit ownership has the advatage that you can see if you leak memory.
Removed overused casting too.

Change-Id: I2336aa07525742d6c1415471ea15ed101406a90c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 10:56:26 +00:00
Marco Bubke
fe5848a47c QmlDesigner: Use view instead of const &
A span of constant elements is a view.

Change-Id: I4fad60673bc2ba98491dfffb7c854beeeb0ae12b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 10:55:47 +00:00
Orgad Shaneh
45aa6a12c4 Git: Support user configured comment character
Task-number: QTCREATORBUG-28042
Change-Id: I96aea27434ba138637728a7fd7d1450e1eee260a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-08-26 10:41:27 +00:00
Mahmoud Badri
3b3e2e1baa QmlDesigner: Add "Create" submenu to the 3D Editor's context menu
Allow adding Quick3D Node-based items to the 3D scene using the contxt
menu.

Fixes: QDS-7397
Fixes: QDS-7399
Fixes: QDS-7400
Change-Id: Ib0a9b1c0243e3e945b4925262f68d80d2460f516
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-08-26 09:39:18 +00:00
Jarek Kobus
a50afa486a VcsCommand: Remove unused SshPasswordPrompt
Change-Id: I402d619656d8339b1e81bc9ae96acf56178505d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-08-26 08:36:34 +00:00
Miikka Heikkinen
3e17d8eed4 QmlDesigner: Change default material preview env to studio env
Since "Default" option is no longer default, it was changed to "Basic"

Change-Id: I8654efbd98fe62f6c4817141fc8559757f5e58e8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-08-26 08:15:15 +00:00
Eike Ziller
aa361b886e SshKeyCreationDialog: Use QDialogButtonBox
This makes the buttons conform to the platform guidelines.

Change-Id: Ide0d7460867e632550c08bc78301d12b66c1f474
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-26 08:08:37 +00:00
Eike Ziller
025bdfe702 VCS: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I364e5b663353f37121279a58f4a9fd514cddbbf0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-08-26 08:03:01 +00:00
Christian Kandeler
d454184467 ClangCodeModel: Use central functions for getting token positions
Change-Id: I192e2807067467906b38e164933755f763133cb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-26 07:44:21 +00:00
David Schulz
5f0270ae4a Utils: clean file name before creating fs engine
Change-Id: I9c4c8132ad509820e0388787ab34bf11b3c4465b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-26 07:36:49 +00:00
The Qt Project
92c529b4a6 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-08-26 07:02:52 +00:00
Eike Ziller
c6c92ec096 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/include/modelnode.h
	src/plugins/qmldesigner/designercore/model/modelnode.cpp
	src/plugins/qmldesigner/designercore/model/rewriterview.cpp

Change-Id: I93c57879b79f27325321bfc045ca618bd835af93
2022-08-26 08:40:23 +02:00
Jarek Kobus
278589a014 GitClient: Reuse VcsCommand::NoOutput
Change-Id: If30d78a34ae77a7397af6374f8b733809ecaab20
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-08-26 06:38:38 +00:00