Commit Graph

72473 Commits

Author SHA1 Message Date
Thomas Hartmann
3dce9690d7 StudioWelcome: Settings for hiding/showing menu entries
Change-Id: I08bc299e9ce32bde2976dcd901babf91a9a1598c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-15 19:57:07 +00:00
Miikka Heikkinen
358b21ce9c QmlDesigner: Fix on-drag binding of created nodes to properties
Generic matching for dragged item to bindable properties didn't work
properly, missing appropriate matches. Now supported cases are
hardcoded with the expectation that in the future this will be handled
via metainfo hints.

Also fixed related issues with dragging images and shaders into
navigator.

Fixes: QDS-6198
Change-Id: Ide9360ef037997cbb388f4c2db35b79eded67aa6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-15 15:22:52 +00:00
Miikka Heikkinen
6173b78860 QmlDesigner: Allow going into component from item library
Added "Go into Component" to item library context menu for items that
have customComponentSource available. Doubleclicking on the item also
does the same.

Fixes: QDS-5786
Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 14:43:47 +00:00
Thomas Hartmann
b0589fb8fe Add options to hide and configure main window
These options allow to hide certain main menus
and move options to edit.

This allows hiding those menus in the Qt Design Studio context.
The options are separated so that power users can enable
Debug, Analyze and Tools.

HideBuild=true
HideDebug=true
HideAnalyze=true

Change-Id: I26758aaa965bb7b61a476d197d82db34e62003b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-15 14:37:29 +00:00
Henning Gruendl
7dc82dace6 QmlDesigner: Add guard pointers to connect
Task-number: QDS-6239
Change-Id: I08a21a8c431046b846d0b41265d8665e93afa0a9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-15 14:25:57 +00:00
Eike Ziller
45c018f560 macOS: Disable ApplePressAndHold
That feature allows entering special characters by holding a key, e.g.
holding the 'l' key opens a popup that allows entering 'ł'. Since that
disables key repeat, we don't want it, though.

Fixes: QTCREATORBUG-26925
Change-Id: I5638337447778b0c873c68195307b92133882e69
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-02-15 13:59:36 +00:00
Christian Kandeler
dad534005e ClangCodeModel: Do not set C_ENUMERATION for enum declarations
... when highlighting with clangd.
This value is only meant for enum values, not types.

Task-number: QTCREATORBUG-27059
Change-Id: I7bb68f5deb6bb215ee3c23d995207019850a7bfc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-15 13:58:51 +00:00
Christian Kandeler
6414f22be7 ClangCodeModel: Fix highlighting of literals with clangd
Some literals are keywords.

Task-number: QTCREATORBUG-27059
Change-Id: I6315bfd4e4179990e55bc046084fdf0a4e3f9e8e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-15 13:58:36 +00:00
Christian Kandeler
a189a74dea ClangCodeModel: Fix erroneous highlighting with clangd
In certain cases, members being initialized were highlighted as output
parameters.

Task-number: QTCREATORBUG-27059
Change-Id: I0de8aee5e4db735251a314b14af04459e6ac772c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-15 13:58:17 +00:00
Piotr Mućko
b1f35bf905 McuSupport: Extract target description to separate file
Change-Id: Ia79d64b5b5a752bdacb404b49e8ac78c2d32ee4e
Reviewed-by: hjk <hjk@qt.io>
2022-02-15 13:53:28 +00:00
David Schulz
dc268e3157 LanguageClient: log exit notification
Add a private function that logs and sends a basemessage without
checking the current server state and use it for server init,
sendContent and exit.

Change-Id: I6532dfb36ef5bf4d036bb71dbfab4ab29497fc9a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-15 13:37:52 +00:00
Antti Määttä
3905239cea Add Quick 3D events to profiler documentation
Task-number: QTBUG-100643
Change-Id: I8e3096892742b647d3aadabfc61e0eab966f11ea
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-15 12:47:08 +00:00
hjk
91fcec3d79 Docker: Remove unused DOCKER_RUNFLAGS
Change-Id: I42ba6ca949d7397be73b2ede6d9380f6f93e7434
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-15 12:21:12 +00:00
Piotr Mućko
9917166b2e McuSupport: basic test & required refactoring
Introduced Package interface for mocking purposes.
Made some functions visible in headers for testing.
Added basic test skeleton for mcu plugin.

run cmd: `qtcreator -test McuSupport`

Change-Id: I1011d49052bd8c894da393d8a285b241682f1f94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-15 11:03:30 +00:00
Christian Kandeler
03340f1fdf ClangCodeModel: Fix flaky clangd test
Signals emitted for the fallback client got in the way.

Change-Id: I29a7fe5221a1f489eff91c772f9a6bb0fff7c4f1
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-15 10:39:03 +00:00
Eike Ziller
e5f5984430 Update qlitehtml to latest master
Change-Id: I84def8f3272f6e393f35119c722897447d6da23f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-15 10:33:01 +00:00
Christian Kandeler
d465dd9f3b ProjectExplorer: Linkify main diagnostic location in MSVC output parser
Task-number: QTCREATORBUG-27056
Change-Id: Ide66fd1ee9c8312653146cfa4a17ec6f662a7949
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-02-15 08:53:45 +00:00
Björn Schäpers
48ce753a05 Debugger: Fix Segmentation Fault on Windows
This amends 035b8aa5f7. shutdown() is
called from GdbEngine and from OutputColloector's Dtor. Thus there is a
change we access m_socket, after it is nullified.

Change-Id: I7d26ded70d0b148d83eb551edaf9b82850db197e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-02-15 08:28:07 +00:00
Christian Stenger
1652be1310 Tests: Provide some cmake files for manual tests
Add another option to mark a test as manual and use this for some
existing.
Manual tests will not be added as a ctest, but they can still get
executed explicitly.
Beside this allow to use a condition when using add_qtc_test().

Change-Id: I03d5397db36c0a2c9ee506a4214ed68fae6ad6e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 08:21:40 +00:00
Mahmoud Badri
42f260747e QmlDesigner: Update expand state upon renaming
Upon renaming an asset folder, update the expand state so that the
renamed folder receives the correct expand state.

Task-number: QDS-6200
Change-Id: I9868cb3e342a8a8488ed0b5a62735bc8af468dfe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:13:30 +00:00
Mahmoud Badri
d1fd23100a QmlDesigner: Fix assets library warning case
Fixed a warning that appears if the search moves from the
"no match found" case to a match case. Also added a small optimization
to searching.

Change-Id: I9e4759fe00959bcbe1a7018c1bdc6cc43069fca7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:12:33 +00:00
hjk
f78f0cc6cb Utils: Avoid accumulating .exe extensions
Change-Id: If635638a89c96b09b17d22d7e7400a046ae320e9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 16:55:44 +00:00
Christian Kandeler
fa071d03cc ProjectExplorer: Fix accumulating .exe suffixes
... when trying to detect GCC on Windows.
Also make the code device-correct.

Fixes: QTCREATORBUG-27057
Change-Id: Iaaa25c152a1cf0e0f05cd6d6db629b7a72b25166
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 16:26:59 +00:00
Christian Kandeler
b31a569b36 Project wizards: Use more recent default C++ standard version
Fixes: QTCREATORBUG-27045
Change-Id: Ia637c6f364d4f651c56f7ffab649fa8e62b5a2cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 14:02:06 +00:00
Miikka Heikkinen
c2db646c6e QmlDesigner: Properly set metatype hints on Model import
When 3D import results in a .qml file with Model as root item,
metatype hints are now set to correctly treat the item as 3D node.

Fixes: QDS-6206
Change-Id: Iaad0d37bcd93eefca87b6c09f6e4f398064fba90
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-02-14 12:39:48 +00:00
Tim Jenssen
f9cceb6267 qds: remove redundant "QtStudio" feature
Nowadays, the decision which wizards will be shown are
done throw the StudioWelcome plugin if it is initialized or not.

Change-Id: Ief95fa8f813408522ac43c31dd6f4ffb069338d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-14 10:33:26 +00:00
Christian Stenger
b82bb52183 Tests: Fix launcherinterface location
Change-Id: I0802d6e26938528635094bc928f55b8a285c1639
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 10:01:04 +00:00
Christian Kandeler
30847a9684 Fix build with Qt 6
Amends 14ee4654c1.

Change-Id: I07d4de825fc16727ae71e5fa519074dddf4b4f80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-14 09:51:44 +00:00
Fawzi Mohamed
b22ca3c467 qmljs: fix scan out of build dir
Scan outside the build directory was possible on mac and windows.
Avoid it by checking the relative path to the build directory.

Change-Id: I6a7082998429f902745146446bf89fc0cc75ca54
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit bdd7fcbac2)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-14 09:49:12 +00:00
Christian Kandeler
e5f8fe311d ClangCodeModel: Remove fallback code for clangd < 13
Amends 4dfdbf91f6.

Change-Id: Ie8657329380e83aeb76503e360afa5ebf0e60fbb
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-14 09:29:34 +00:00
Eike Ziller
dfd3f81084 Bump version to 7.0-beta2
Change-Id: Id6c117792e2dbf3a15fcafcc815a243535357f41
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 09:17:39 +00:00
David Schulz
5b307634c3 LanguageClient: fix race condition on client shutdown
If a document is closed between removing a closing client from the
tracked clients in the LanguageClientManager and the actual destruction
of that client we might derefernce an already desctructed document in
resetAssistProvider.

Connect the document closed signal in the client instead of the manager
so Client::closeDocument gets called even if it is not tracked in the
manager anymore.

Fixes: QTCREATORBUG-26534
Change-Id: I7187730600eeb1df54355065eb9cb703a605139e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 09:03:51 +00:00
Alessandro Portale
8dcb5097f5 Utils: Ensure that VariableChooser window title bar stays on screen
Prevent negative y-coordinates when centering the VariableChooser
over the launching toolbutton.

Fixes: QTCREATORBUG-27054
Change-Id: I4212c7120470f8c2014fbe27205de8430cd13a6f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 09:01:05 +00:00
Christian Kandeler
81218043d0 ClangCodeModel: Fix mis-highlighting of lambda calls
Calls to lambdas without arguments that are declared as const variables
were erroneously displayed as output arguments.

Change-Id: Ibd914431a34157606694f85d8e00c0dd1db1a618
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-02-14 08:43:18 +00:00
Eike Ziller
bb59a00229 Fix issues with showing code pasting URL
- use common signal for posting output for fileshare protocol, so it
  correctly behaves wrt the settings
- flash even when not opening the output pane when showing the output
- MessageManager::writeDisrupting should switch the output pane even if
  another output pane is currently open (which enforced with
  IOutputPane::WithFocus)

Fixes: QTCREATORBUG-26975
Change-Id: I51586eaca826f81f7e72f147fce7e72cbf639c6c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-14 08:08:20 +00:00
Thomas Hartmann
dd6d6263d4 QmlDesigner: Shorten the visual block of form editor view
Since we cache now the images from the puppet 100ms are sufficient.

Change-Id: Ibf5bd40cb4d5d9c249db8ac4a2c5e60e31df3504
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-11 16:36:42 +00:00
Christian Stenger
900cd206c8 Shootout: Fix compile with Qt6 on Windows
Change-Id: I817eb9b02b09db76a2bebbc5f28388be96a4c54f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-11 16:03:50 +00:00
Henning Gruendl
c2cd524cdb QmlDesigner: Add functionality to welcome plugin
* Add extraction progress and birth time
* Add URL probing in downloader
* Add last modified and available information
* Overload openExample() function

Task-number: QDS-6174
Change-Id: I68782629da3ec4da5aab95d00510b7bc7085aa66
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-02-11 15:51:41 +00:00
Christian Stenger
fba9a3514f Tests: Add some more information to README
Change-Id: I84be21478f26a48cee271836793ff74835d456e9
Reviewed-by: hjk <hjk@qt.io>
2022-02-11 15:44:39 +00:00
Christian Stenger
39db18f968 QmlJS: Soften strict equality check Pt III
Adapt to differences Qt5 vs Qt6.

Fixes: QTCREATORBUG-25917
Change-Id: Ieee1cf0442016c62b82bd932dd62d0dc9a78bc26
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2022-02-11 15:44:22 +00:00
Thomas Hartmann
125ac37724 StudioWelcome: Only show project folder path
The project file name is usually the same as the folder and does
not add extra information.

Task-number: QDS-6169
Change-Id: I2673a30130cd73daa7bb6811b00e1cb05ee2444c
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-11 14:29:26 +00:00
Christian Kandeler
fde7b90ee9 Fix some warnings
Change-Id: I2991f0ab84b26c93c0dbe2ec79f7638d299e3d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 12:14:27 +00:00
Henning Gruendl
92c786d21e QmlDesigner: Add new color values
Add DSgreenLight, DSamberLight, DSredLight colors

Task-number: QDS-6174
Change-Id: I59e745aabc8b8182c36027f875af7709f8c62060
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 11:35:28 +00:00
Henning Gruendl
3688ee17fc QmlDesigner: Add new icons to icon font
Add downloadUnavailable, downloadUpdate, downloaded icons

Task-number: QDS-6174
Change-Id: I473cd786b3eb12aeb79b737141a7bb8da381e0e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-02-11 10:42:01 +00:00
Eike Ziller
a50561591a Bump Qt version for GitHub and COIN to what we use in official binaries
Disable MinGW build on GitHub because of toolchain incompatibilities.

Change-Id: Ie5f09e3463b05f7cda8694180c9d7e562a7624e7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-11 10:26:00 +00:00
Christian Kandeler
7123a41c1e ClangCodeModel: Improve ifdef'ed out code handling with clangd
- Made code more self-documenting.
- Added more comments.
- Added debug output.
- Rewrote ugly redundant code checking for #ifdef & friends.
- For consistency, emit update about ifdef'ed code only
  if we also report the other highlighting results.

Change-Id: Idd3cbd3c169343bcaf6b6b19330130378ac6c5d0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 10:11:25 +00:00
Christian Stenger
07506ab695 KSyntaxHighlighting: Fix qbs build
Amends 37f8fcd791.

Change-Id: I0734e26fc8015eb31d6cbbd86444179ee14c8304
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 09:58:48 +00:00
The Qt Project
5a278d78f2 Merge "Merge remote-tracking branch 'origin/6.0' into 7.0" into 7.0 2022-02-11 09:51:03 +00:00
Orgad Shaneh
b0d572789b Git: Fix assertion when upstream branch no longer exists
Change-Id: I5033d43571026ab0d9b8b94892b4075e130211be
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-02-11 09:50:09 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00