Commit Graph

75236 Commits

Author SHA1 Message Date
Piotr Mućko
ae69073fc1 McuSupport: Add override keyword to McuPackage::setPath()
Change-Id: Ib982d9e9da4dd6e9ae0d5f87ae29d884c556ebbb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-24 15:26:51 +00:00
Yasser Grimes
cd36947561 McuSupport: Handle projects with "-" in their name
Using "-" in a McuSupport project's name will result in errors. This
commit fixes that by changing the occurrences of "-" with "_" in the
templates used for generating the project.

Task-number: QTCREATORBUG-26512
Change-Id: I7e65e3992bf1fa139d008ff5c2221a1098c12b92
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
2022-08-24 15:26:07 +00:00
Artem Sokolovskii
2d375eb776 ClangFormat: Move override checkbox to global settings
Moved override checkbox to global settings groupbox.

Change-Id: I70c97486a61f69274d059edc5095fe02c86fb04d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-24 15:11:40 +00:00
Eike Ziller
d3354d1999 Optionally show locator popup centered
when using the menu item or shortcut.
Turn on with "Open as Centered Popup" in the "filter" menu in
the locator input field. Default is off.

Change-Id: Ic1e0d2188aba924d25fe5b6f0048ae8c3adf1aa8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-24 12:40:16 +00:00
David Schulz
60f5275edf Client: rerequest document highlight if server is unreachable
Makes sure the highlight is properly updated and prevents assert in
Client::sendMessage.

Change-Id: Ie7ad54c34272867e17f6e20654f27e2fd8711fdc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-24 07:53:21 +00:00
David Schulz
09f0ddb50c CppEditor: fix crash in outline
Make sure the document lives as long as the generated symbol items.

Fixes: QTCREATORBUG-28091
Change-Id: I515748ab7fd198699434ac5c19585afa20df613d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-24 07:04:00 +00:00
Marcus Tillmanns
8b143be86c Debugger: Adds boost 1.79 dumpers
Change-Id: I2111b91fe8914afdde54edd6009691dfe32e64a4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-24 06:56:08 +00:00
Eike Ziller
c0a0daf588 Environment: Add convenience wrappers similar to qEnvironmentVariable*
Adds corresponding wrappers that work on
Environment::systemEnvironment(), which can be different to the
environment that Qt Creator currently runs in, depending on the settings
in Preferences > Environment > System > Environment.

Change-Id: Ib1db37d2828b686d9a3233d170612beea9d12946
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-24 06:46:29 +00:00
Christian Stenger
79949d9ae8 Tests: Adapt QVariant dumper test
Disable QVariant holding a typedef'ed QMap for
now (insignificant).
Adapt expectations for QVariant holding a QList.

Change-Id: I188e01b2d53d17057207db06e9e848a5bfb3adb2
Reviewed-by: hjk <hjk@qt.io>
2022-08-24 04:54:50 +00:00
hjk
20400b263e ProjectExplorer: Code cosmetics
Namespaces, white space in jsonwizard.

Change-Id: I92f724d170380cb27f478a7e43d2ea9e6b35c03b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-23 15:19:08 +00:00
Christian Kandeler
ca00b874a7 CPlusPlus: Support structured bindings
While we do recommend clangd for modern code bases, we should still be
able to parse basic language constructs.

Fixes: QTCREATORBUG-27975
Change-Id: I189b991685a5cd5f62f2afce77878b60c895e8f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-08-23 13:52:11 +00:00
Marcus Tillmanns
5fab54d95a SSH Device: Add SSH port to Device wizard
Change-Id: Ia4cc3b7bb0074930f32d58393651f6c961c69b28
Reviewed-by: hjk <hjk@qt.io>
2022-08-23 10:55:37 +00:00
Marcus Tillmanns
42e1714ea1 debugger: Fix dumper for std::string and unordered_multiset
Moves mac specific dumpers to separate file
Creates android dumpers for stdtypes

Change-Id: I33d28198e1a2f24fb7707313845db81e283686cd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-08-23 10:49:43 +00:00
Marco Bubke
84c1d6572b Utils: Remove variant.h
Since we are now requiring macOS 10.14 we can remove our local copy of
std::variant and use for macOS std::variant too.

Change-Id: I589d03b35fc56878b7392ffa7047a439e588fe43
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-23 09:51:43 +00:00
Artem Sokolovskii
17693bc415 ClangFormat: Fix list declaration
Fixed list declaration indentation.
Fixed function declaration with parameters on the new line.
Added tests for both cases.

Fixes: QTCREATORBUG-25011
Change-Id: Ida4f6ec4f407c5e5b015dc2c0afff110262d9645
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-23 09:07:59 +00:00
Christian Kandeler
5817bdf87d CppEditor: Consider selection when requesting quickfixes
If the user has a token selected, prefer that to the actual cursor
position.

Fixes: QTCREATORBUG-27886
Change-Id: Ib32e24676510bff42292fe23e4962720fcbac4ed
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-23 08:37:07 +00:00
Christian Stenger
13a9f6663b ResourceEditor: Fix include and Qbs build
Amends bc19a26c06.

Change-Id: I1c370c982cbb9e4b5aa7887043d097b1cce76d5e
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-23 05:09:35 +00:00
Alessandro Portale
d0f134aa49 Help: inline .ui files
bookmarkdialog.ui
topicchooser.ui

Change-Id: Ic5c36db648a56546ecf12ce2cb31a593732e7990
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 19:49:58 +00:00
Piotr Mućko
fe9de4e205 McuSupport: Evaluate cmake variables in paths
Change-Id: I04dd77bd5420e57903afe281e6e2601782795909
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 17:36:18 +00:00
Piotr Mućko
e31016ccc3 McuSupport: Move global toolchain type mapping to function
Change-Id: Ibe11c574d3427fa7f38f1e4df30400ec3d11294b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-08-22 17:35:59 +00:00
hjk
bc19a26c06 ResourceEditor: Convert to using Tr::tr
Change-Id: Ia9a04dc76bf84e9e9078894be3459fe65fcd5fff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-22 16:05:33 +00:00
Alessandro Portale
708df011b4 ResourceEditor: inline qrceditor.ui
Change-Id: Ie8ec4a7c333287c1ad6e94691ca2d988547d419c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-22 14:33:35 +00:00
Marcus Tillmanns
62bb8b9686 CppEditorOutline: Fix warning
Change-Id: I7b3d212fb2b8c8a2b9f6af9a5445ac48e6e51b9c
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-22 13:52:23 +00:00
hjk
3c9aa364ec Utils: Make LayoutBuilder::Setter a LayoutItem
Weird, but makes GroupBox implementation less special and allows
several setters without resorting to using extra {...} there,
which would be needed e.g. for title _and_ toolTip.

Change-Id: Ie0e64a7bae15825292a473a1e973817be5c27fc4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-22 13:32:01 +00:00
hjk
11648298c8 Utils: Port some FilePath part accessors to QStringView
Change-Id: Ib5cc262e44c73880b6538eed714365e3d685870a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-22 13:27:56 +00:00
hjk
66a9301bd9 Move changes-8.0.1.md closer to its siblings
Change-Id: Iae9ce187c600032bfd5f4daf84079b63ea8ac184
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-22 13:27:38 +00:00
hjk
266adf7b1d Debugger: Delay template argument retrieval from native types
For performance reasons. They are often not needed.

Change-Id: I8a7bb03583b3ec2479a3691486c9c02f70ad014e
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-08-22 13:26:02 +00:00
Christian Stenger
cd071e299a Debugger: Export BreakpointManager and some icons
Allow retrieving of breakpoint information without
the need to create a debugger engine.
Export some icons for re-use.

Change-Id: Ic3d5f22840c1b67e8b3e4e0892c204da3ab1af9e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 12:25:32 +00:00
Marcus Tillmanns
7e37899565 Dumper-tests: Adds Logging Category for easy debug msg suppression
Change-Id: Ic871558f7ef82489030e574e8997277221e0b63d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 11:26:39 +00:00
Jarek Kobus
71f0597e49 ClangFormatConfigWidget: Avoid using sender()
Use Utils::Guard instead of Utils::ExecuteOnDestruction.

Change-Id: I7f2be9c3864d9cac31423353d46dfa98660dd0af
Reviewed-by: hjk <hjk@qt.io>
2022-08-22 10:11:01 +00:00
hjk
70089a8701 QmlDesigner: Fix compile fix
Amends 82a010f67a.

Turns out that 04dc959d49e5e3 in Qt 6.4 introduces a source
incompatibility intentionally.

Use 'auto' to cover old and new behavior.

Change-Id: I4cf69393e0c1a483261b3f283b6bce97f664e3ce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-22 09:26:24 +00:00
Jarek Kobus
c30a695784 Drop Qt5: AdvancedDockingSystem: Remove code below Qt 6.0.0
Change-Id: If2ebc32c8057d1f614fd8d3749be97c923453585
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 08:59:30 +00:00
Jarek Kobus
024dbd18b6 DockWidget: Avoid using sender()
The toggleView() was used as a signal handler for
m_toggleViewAction and as a public method. In the latter
case checking the sender doesn't make any sense.
Add a lambda as a direct signal handler for m_toggleViewAction
and perform a custom modification of the open arg before
calling toggleView().

Simplify setToggleViewActionChecked() implementation.

Change-Id: If3799110b3f1dcf6fe0c653ebcfd23f9716cb2f3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 08:59:23 +00:00
Eike Ziller
60f2945f08 FilePath: Remove unused include
Change-Id: I0ad971a65d25bcecf19c2094225f7f95f9121385
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-08-22 08:16:37 +00:00
hjk
82a010f67a QmlDesigner: Compile fix
Amends 2d86c290ce.

Change-Id: I26fc5871193b600ed4576b14dd1aa141140f30d0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-08-22 08:16:17 +00:00
Eike Ziller
74a986b350 FileUtils: Fix sdktool build against 5.15
Change-Id: Ieb9cc8baa684008a5ad1db28648870715f8db0d7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-08-22 08:11:01 +00:00
hjk
c02af3dd0e Utils: Introduce a Layouting::WithFormAlignment AttachType
Useful for layouts that should appear as forms but are using
QGridLayout for further alignment in the fields as e.g.
the Kit settings does.

Change-Id: Iec3195b1528dfe052eed5a34379a946db6bf8e54
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-22 07:18:22 +00:00
Christian Stenger
c490ffacd7 QmlDesigner: Fix compile
Change-Id: I247fe6b962f0b67055e797189626752d51484b71
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-22 05:22:13 +00:00
David Schulz
8031460734 LanguageClient: avoid creating a QTextDocument for every contents change
clone the document when it is opened and adjust it after each contents
change

Change-Id: I4fd511a3b142b1875f1da7d241ab5cddf49322e8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-22 04:38:08 +00:00
The Qt Project
825b781a07 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-08-19 12:24:55 +00:00
Christian Kandeler
1c0ef80861 ClangCodeModel: Fix semantic highlighting for __func__
This is a local variable, not a macro.
Also take into account the new upstream support for this (see
https://reviews.llvm.org/D131175), which required us to fix our
assumption that "static" always means "static member".

Change-Id: I69f3c98737571cbd55f9c64c02292426acb6031b
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-19 12:23:54 +00:00
Eike Ziller
64247bf571 Merge remote-tracking branch 'origin/8.0'
Reverts/comments out parts of 45f93a817a,
which needs to be resolved in a follow-up commit.

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
	src/plugins/python/pythoneditor.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
	src/plugins/scxmleditor/common/colorsettings.cpp

Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b
2022-08-19 12:48:27 +02:00
Orgad Shaneh
4cf75c78ac Git: Minor cleanup in GitSubmitEditorWidget
Accept CommitData struct instead of passing most of its members separately.

Change-Id: I04b3b7ea0c02d12cae87e42d44af3808722b6371
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-08-19 08:01:58 +00:00
Eike Ziller
aa5b971dca Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I183c69e40aa36be6140c732d097a03bb5b2b3c5d
2022-08-19 08:34:42 +02:00
Eike Ziller
0fc8e31af9 QmlDesigner: Fix some more license headers
Change-Id: I19419745ce79a339875e92e86d7e599a8c2ddeb0
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-19 06:34:12 +00:00
Mats Honkamaa
814115256c Doc: Update info on how to get Bridges
Qt Bridges are nowadays avaialble in the QDS enterprise license.

Task-number: QDS-7356
Change-Id: Iec78d8879698462292626c413bfc0810e68c40b7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-19 05:22:33 +00:00
David Schulz
33001a866f CppEditor: remove dependencies between different outline views
Change-Id: If371811ac236c971d21815ef8738df5a169865e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-19 05:04:29 +00:00
Alexander Akulich
7c7fdf6460 CMakeSettingsPage: Reload data on CMake executable path edit finished
This fixes missing/outdated 'Version' information and maybe useful
for more data later.

Ammends commit 057bb3095b

Change-Id: I2d3976fd396ec440e3fa7b67af008175ab4c9048
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-08-18 21:13:20 +00:00
Henning Gruendl
56b0fab13e QmlDesigner: Fix debug compilation error
In WelcomeMode accidentally the wrong widget was used. Fix by replacing
m_modeWidget (QWidget) with m_quickWidget (QQuickWidget).

Change-Id: Ie04dc3a2cc843ee4d430c3cefba6c48697c6046f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-08-18 16:33:04 +00:00
Mahmoud Badri
2d86c290ce QmlDesigner: Implement copying specific material properties section
Change-Id: I34bed00c89018e86941c4e5a7ddeae44c06f850d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-18 15:11:18 +00:00