Commit Graph

72385 Commits

Author SHA1 Message Date
Christian Stenger
8368b4ed64 QmlDesigner: Fix build on Windows
Use Qt styled enum values to avoid clashing global defines.
Amends 06a6549075.

Change-Id: I85d3ec4192c1c55f231b6e2e81ec114480c03a5c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-18 10:18:09 +00:00
Vikas Pachdha
a86e693b4a Fix index out of range crash
Change-Id: Ifa943d3d240c7ffab0bd21f50ff66d796c78401e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-11-18 10:04:45 +00:00
Samuel Ghinet
00d186ce10 QDS NewProject dialog: use friendly error message when regex does not match
Instead of telling the user that the project name does not match a
complex regular expression, we can tell him in English words what the
rules are.

Also, updates the icon of the status message so that, when the status is
multiline, the icon appears at the top, rather than vertical center, on
the left side of the text.

Change-Id: I848b3858f5f92a09588b9646c56cbf743b06ea09
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-18 09:50:41 +00:00
Tapani Mattila
06a6549075 CMake generator: Add sanity checks
Task-number: QDS-5410
Change-Id: I8f3cd130d7f5bfac3656e8d006661a81a5412abd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-11-18 09:27:23 +00:00
Anton Alimoff
d06183d9cc Add debug helper for std::variant
Change-Id: Ifb2f47203fb5c101be5b2180693e39ba07b90c2e
Reviewed-by: hjk <hjk@qt.io>
2021-11-18 09:03:31 +00:00
David Schulz
e68e2a3159 QMake: fix gui thread lock
Do not look up windows network paths in profile editor when looking for
links under the cursor. The QFileInfo::exists check can take up to a
minute here if this network path does not exists.

Fixes: QTCREATORBUG-26579
Change-Id: I2648bc398e25bcc660f1161a187c4d92c3def28e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-18 08:11:51 +00:00
Eike Ziller
db1d3f3c94 Fix locator popup on Windows
When the locator popup gets focus on Windows, we need to handle the
escape key explicitly and also need to make sure that it isn't
considered as a "base window" when requesting locator again.

On other platforms the locator popup never gets focus, so the issue
doesn't appear.

Fixes: QTCREATORBUG-22119
Change-Id: I1e1a74332c174bc20f961ebe0709c591f82f2829
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2021-11-18 07:38:49 +00:00
Christian Stenger
93d67dd6ac Utils: Fix missing include
Amends 5967dd52ed.

Change-Id: I0fe1f8f9967eac679c32c9e6288249f8a0c575ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-18 05:45:13 +00:00
Andre Hartmann
1b57bee32b Debugger: Remove ancient enum without usage
Change-Id: Ifd303bc822a850d6b28d8fb31475af54a25601a4
Reviewed-by: hjk <hjk@qt.io>
2021-11-17 18:10:48 +00:00
Christian Kandeler
037d2b3889 ClangCodeModel: Fix clangd highlighting of string literals
... passed to macros defined in a different file.
This amends e77e57420a. Contrary to our expectation, it is possible that
AST nodes that are marked as belonging (only) to a header file can
contain child nodes that belong to the main file.

Fixes: QTCREATORBUG-26553
Change-Id: I4d1d877d8e1e2dcf7d81b63aa98e1149b5514e3f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-17 14:46:37 +00:00
Jarek Kobus
d4ddd6754d Remove unused SshRemoteProcessRunner::writeDataToProcess()
Change-Id: Ib07c7c9cd19b498f84382d2c9c11b927533e4d85
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-17 14:01:52 +00:00
Alessandro Portale
9cc2b7aaf3 qmake/qbs/CMake builds: Remove "recommended" dependency on Designer
Recommendation of Designer is the artifact from an earlier solution
for adding code of .ui files to the code model. The refactoring of
extra compilers made that superfluous, this change removes the
left-over traces.

The CMake build of Qt Creator breaks because of the recommendation
if the qttols module is not installed.

Amends: 78d3191363

Change-Id: I64827492d79a9238dc8512047abd581f9da3189e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-17 13:46:07 +00:00
Christian Kandeler
03e6351c0e ClangCodeModel: Provide clangd memory usage in language inspector
Change-Id: I8a87cb5f267571584b2eecac06be65b841592c7a
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-17 13:43:59 +00:00
Christian Kandeler
78562d4925 LanguageClient: Allow clients to provide extra tabs for inspector
Change-Id: I530eca50393289dbf85fb0088d2a62c2729d28b2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-17 13:43:29 +00:00
Marco Bubke
9d24d886e2 QmlDesigner: Add imports for qml document parser
Task-number: QDS-5174
Change-Id: I78b7b31108b498035eccb8385ffab621c727cd89
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-17 13:41:28 +00:00
Thomas Hartmann
607f70f0f9 QmlProject: Use QtcProcess instead of QProcess
Change-Id: Ie80ed4bd3d831718e7f246d6b8ab9df9db8c67d1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 13:15:01 +00:00
Thomas Hartmann
dad7deccc4 QmlProject: Use fromUserInput for settings
Change-Id: Ib591c703e8badc2f12337680a788c051e1a7d974
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 11:44:10 +00:00
Cristian Adam
be9f7313b6 CMakePM: Remove UNINITIALIZED SOFT_ASSERT
Fixes: QTCREATORBUG-26582
Change-Id: I2a453a3044f2cb6eed0fd3f27ceae97fe347fdba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-17 11:18:08 +00:00
Jarek Kobus
5967dd52ed CommandLine: implement debug streaming operator
Change-Id: I09a47d70d5bea315efa1af505f7afc69c8075310
Reviewed-by: hjk <hjk@qt.io>
2021-11-17 10:48:45 +00:00
hjk
898210f0a1 Debugger: Fix passing tooltips from to toolbuttons
Visible in the O and <> buttons of the Callgrind toolbar.

Change-Id: I1016f853335bfc243f7e934e7a0cd430922c8af6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-17 08:54:42 +00:00
Antti Määttä
96db947c81 Fix particles play button state when scene changes
Add play button state to the scene state.

Task-number: QDS-5499
Change-Id: Id3035de439aa80fd782348cf89a1d8456a7dd006
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 07:13:25 +00:00
Leena Miettinen
e6e69ad07b Doc: Update info about qmake build settings
Task-number: QTCREATORBUG-26278
Change-Id: Ifa7cd0349ca31c97f8f8db28461db6a4200180fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-16 17:04:43 +00:00
David Schulz
899a4d1f10 LanguageClient: Reopen document after restarting crashed server
Change-Id: I7c8518a631a45ea784ff849b703ae1e9abfba396
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-16 16:16:14 +00:00
Alessandro Portale
dd1882b817 WebAssembly: fix the running of targets with name != project.name
The new QtQuick application wizard for Qt 6.2-based applications now
uses different names for the project and for the main target.

The WebAssembly plugin cannot construct the html file name for launching
like <projectname>.html, anymore. It instead would need to use
<targetname>.html for that.

The author of this patch did not manage to programmatically retrieve the
target name or buildkey. So, as a hack, we simply chose the first html
file that we find in the build directory.

Fixes: QTCREATORBUG-26562
Change-Id: I7e929fe265a15501c7275e2c76b7f5fa4ed1e6b5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-16 13:39:21 +00:00
Eike Ziller
531f3ada2c CMake: Add xcodebuild parser for "Darwin" targets
Similar to the qmake make build step, so build issues are parsed for iOS
builds.

Task-number: QTCREATORBUG-26541
Change-Id: Ie71a3087feab2720f6d8b4974d221a70c3fe76fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-16 13:02:33 +00:00
Eike Ziller
5a07396205 XcodebuildParser: Fix parsing for newer Xcode versions
The output of xcodebuild changed, and no longer contains
"BUILD (AGGREGATE ...)". Instead it prints various "note:"s.
Use "note: Build preparation complete" to trigger parsing the following
output on stdout for error messages.

Task-number: QTCREATORBUG-26541
Change-Id: I9dabcc30389352aa5f78dae31104a8c9cf56eb19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-16 13:02:20 +00:00
Jarek Kobus
1b772dcb27 Use QtcProcess in FormatTask
Change-Id: Ifd46259fc4e8b68342315a227748f2ecb9acc9d6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-16 12:32:05 +00:00
hjk
0030836f96 Android: Fix compilation
Amends 35e6991772.

Change-Id: Iba3dcf86b7b1ca7963a0b99798dafec85d19bd65
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-11-16 11:45:17 +00:00
Thomas Hartmann
55c21cecdf QtDesignStudio: Split "New Files" from "New Project"
Just having the "New Project" dialog there is confusing to many users
and they do not know how to add new files.
Upstream in master we can remove the condition and split the dialog
also for Qt Creator.

Task-number: QDS-5494
Change-Id: I9a21f27fad932759fcfc412ecfac7f3f6d2bcfee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-11-16 11:24:19 +00:00
Henning Gruendl
9116256a86 QmlDesigner: Add fake Android kit workaround
Add a workaround to make a fake Android kit work. Fake in this case
that it uses a default desktop Qt version which doesn't contain any
Android compilers. In order for that to work the deploy step needs to
be skipped.

Task-number: QDS-5385
Change-Id: I69a5c78ac810de916b3180736e61d6083d66d121
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-11-16 11:11:18 +00:00
Piotr Mikolajczyk
35e6991772 Fix bad activity if designviewer built with qt6
Changed the activity name run, so only the Qt6 version
of Qt Design Viewer is launched.

Change-Id: I79efc2a4ab37e9015b2feabda08ce274c6fca553
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-16 09:36:22 +00:00
Jonathan Mouchou
6efcd09063 Android: Fix AndroidManifest wizard invalid package source dir
Fix the wizard from inserting the filename for the file path leading to
an invalid directory.

Example invalid path: /projectpath/projectname/projectname.pro/android
With fixed path: /projectpath/projectname/android

Fixes: QTCREATORBUG-26580
Change-Id: If82a6f795ca400beddc26b959e65ea066ad79433
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-15 18:41:58 +00:00
Leena Miettinen
949f7c3e84 Doc: Describe "Build missing" option in Conan build step
Task-number: QTCREATORBUG-26278
Change-Id: I0b13495c9bf4b20b4b19e00913b544931d29363d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-11-15 16:24:41 +00:00
Vikas Pachdha
ccf2e920dc Doc: Update Qt-Bridge plugin doc for adobe XD
Document Text Rendering, XD Component support and limitations

Task-number: QDS-5256
Change-Id: I6a83b0ee5e67db60392cd5dbe17a3feb70564b7e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-15 16:04:28 +00:00
Leena Miettinen
e76b47f184 Doc: Update info about Qbs build settings
Task-number: QTCREATORBUG-26278
Change-Id: Iab2df11d613f6c0a1aa119fcc85104e1bc53e08e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-15 15:39:18 +00:00
Samuel Ghinet
d8c8d7a25e Update background colors in all themes other than design dark
While we have chosen lower contrast lighter values for the design dark
theme (via normalBackground and alternateBackground from Palette), the
New Project dialog box did not look well on other themes. I have
replaced the background colors for those other themes, so that
DSBackgroundColorNormal is now set to the value of
DSsectionHeadBackground, while DSBackgroundColorAlternate is set to the
value of DSpanelBackground, which makes the dialog look more like the
property editor.

Also, fixed the item delegate in NewProjectView, which had a
non-transparent background. This background was visible on light
versions of the theme.

Change-Id: Iad7dea1ea1a03839293148178dbc441c05b3fb7f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-15 14:57:09 +00:00
Leena Miettinen
d99145fc54 Doc: Update info about compiler options
Add screenshots.

Task-number: QTCREATORBUG-26278
Change-Id: I55a7f903fd740744c2fc9ada44544641291b95bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-15 14:44:38 +00:00
Eike Ziller
20641cac7e XcodebuildParser: Remove unused variables
Change-Id: I753bfb50a5274d8c5e9f52b26e0f8173b243f9e6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-15 14:39:05 +00:00
Christian Kandeler
5769dbe0aa ClangCodeModel: Force clangd re-highlighting on font settings change
Change-Id: Ie449a5329bd49eac116751e66a07602f316e147d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-11-15 14:35:02 +00:00
David Schulz
b41280b942 LanguageClient: do not send semantic requests to unrelated server
Change-Id: I97207a8569a5e26a7587fefc07d638b17d36d40b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-15 14:28:33 +00:00
Thomas Hartmann
20017769c4 QmlProject: Improve warning message
Change-Id: I0b8aaa8dcb6926c9a23c297fa13a7ec4eda0089b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-11-15 13:28:34 +00:00
Eike Ziller
ff5bfe6f0f Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I366a1a0e378811dfc9b4e6f42ec96426dbb15356
2021-11-15 13:14:24 +01:00
Samuel Ghinet
cb2291bb57 Update style images
Change-Id: I456aa22ea3ab7f067daed93077a9a6994f7aabb3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-15 11:45:02 +00:00
Jarek Kobus
90972ad822 Fix a crash on shutdown inside CallgrindTool
This is a quick fix for 6.0 branch.

Fixes: QTCREATORBUG-26563
Change-Id: Ida0f99a90c2e8515a2ea2b89de7a666f3067f908
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-15 11:09:54 +00:00
Henning Gruendl
87c8f4890e QmlDesigner: Update translation icons
* Fix characters U+009c and U+00ad not working by skipping those

Change-Id: I7c156184c1bd2ca6116d1bbdf8f0a61382340ce2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-11-15 10:28:39 +00:00
Christiaan Janssen
983ca3106d McuSupport: avoid double-space strings in warnings
Change-Id: Ia40412154662ce9a22ae569c9f8abf31b419cbce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-15 10:23:17 +00:00
Leena Miettinen
ffc30fedc9 Doc: Describe creating a PySide6 project with the wizard
Task-number: QTCREATORBUG-26278
Change-Id: I643a10cff0a30f0de31851dc5d2077c11248f62e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2021-11-15 09:28:03 +00:00
Cristian Adam
e58b8aee0c GitHub Actions: Update ccache to v4.5
Change-Id: I566addec66ab374963cbcc0e0a85be1b45597d24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-11-15 08:52:40 +00:00
Thomas Hartmann
39738dee77 QmlJS: Add error message for Component with multiple children
Component is only allowed to have a single child element, that will
be the root element of the component.

If there is no child at all we create a warning. Having no child is
temporarily required.

Change-Id: I5c0d9d9cdf1be106b20ed4f1134a973d58126498
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-12 20:04:19 +00:00
Samuel Ghinet
ebc753cf9b Replace TextField with RealSpinBox for custom width and height
Change-Id: I07f993033a4a0fa5168abd0636fc883bd3ccd7fe
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-12 15:24:41 +00:00