Commit Graph

75218 Commits

Author SHA1 Message Date
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
Thomas Hartmann
c7f742a546 QmlDesigner: Recreate QuickWidget on download
Instead of resetting the engine we have to recreate the widget
to avoid a crashes.

Task-number: QDS-7355
Change-Id: Id0d202c5da1d13433a95442156815056168b998b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-08-18 14:46:40 +00:00
Aleksei German
e8d05da529 QmlDesigner: Exclude Behavior children from Scene
Task-number: QDS-7444
Change-Id: I6bd04f7619ae15d2fce81d79d1a1c59e33e834c8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-18 14:23:47 +00:00
Thomas Hartmann
b899a27c86 StudioWelcome: Disable welcome page during download
Change-Id: Ic85dfd79e4c43822805ce2a7f392f9b0a5d2a923
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-18 13:42:44 +00:00
Marcus Tillmanns
2770f92f53 QDS: Fix unused variable warnings
Change-Id: I3ea21d5883cb75dd2507ad3d0aa6b3e24ed8354e
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-18 13:21:18 +00:00
Alessandro Portale
4084b2ae3f QbsProjectManager: delete qbscleanstepconfigwidget.ui
Unused form. QbsCleanStep has been aspectified a while ago.

Change-Id: I97da5e081ce1442efd278e5a3d60f77031c612e1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-18 13:00:00 +00:00
Eike Ziller
792c5271e2 Bump version to 8.0.2
Change-Id: Ib7e45eb039bcba4430259babbd3d398258f62c5c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-18 12:31:15 +00:00
Knud Dollereder
5c68fb68ce Do not update control values when pressing cancel
Change-Id: I3d365e760fa8ba4a0b36a995d0bf6a59f2d9734b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-18 12:02:31 +00:00
David Schulz
dc2cd9db94 LanguageClient: correctly disconnect documents changed signal on reset
connect calls to a lambda can not be disconnected with the
sender->disconnect(receiver);
syntax, so save the connection in a QMetaObject::Connection and use this
to disconnect the signal.

Fixes: QTCREATORBUG-27596
Change-Id: I69f5d990aab4e85d768e2101f0157a7dee3c1fa1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-18 11:58:57 +00:00
Marco Bubke
550dadb86e Utils: fix narrowing warning
We test the small string capacity anyway, so we never write a larger
size.

Change-Id: Ie3a2f907898229fdee6219149917d9fddd3297e6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-08-18 11:35:07 +00:00
Miikka Heikkinen
e4b35fa576 QmlDesigner: Block preview data change handling when initializing
Handling the data change is pointless when we are initializing UI
to stored values, and can also trigger undesirable secondary effects
like showing color selection dialog.

Fixes: QDS-7415
Change-Id: I0321c47d5a63971dc890c37f90ec6fedc8293eca
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-18 11:10:53 +00:00
Miikka Heikkinen
326f70c40f QmlDesigner: Add support for component materials
Component materials can now be seen on material browser and their
properties are properly shown on material editor

Fixes: QDS-7390
Change-Id: I3f7edfe655bdb0da1fa71739c825d09d6101c386
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-18 11:10:42 +00:00
Miikka Heikkinen
2e8574bd76 QmlDesigner: Add scene root material support to material editor/browser
If the scene root item is Material subclass, material library is not
created for the scene. Material editor and browser functionalities that
relate to having material library are disabled.
Material editor will always show the material that is the scene root.

Fixes: QDS-7374
Change-Id: Icd1c212c17b59e4a2caa6b3b4d7e615e68b21eb9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-08-18 11:10:04 +00:00
Cristian Adam
c7cdd55dea ClangFormat: Fix build for LLVM 15.0.0
This fixes the CMake build of Qt Creator against LLVM 15.0.0

Change-Id: Icecd45821091c8c2b565246cb17ce5a6e5c49f36
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-18 09:43:30 +00:00
Marco Bubke
5a8d7c3d51 Utils: Remove code duplication in SmallString
It removes unwanted null termination too.

Change-Id: Iaea8699f7ccc387776b43e897fdd099764af2773
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-08-18 09:25:55 +00:00
Mahmoud Badri
d4cc3fddc9 QmlDesigner: Implement copy/paste material properties
Fixes: QDS-7014
Change-Id: I2a8b779f97de353836a4d506b715720b490c349f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-08-18 09:12:10 +00:00
Alessandro Portale
0ec7a3797d Utils: Add a non-toolbar variant of the MINUS icon
Make it consistent with Utils::Icons::PLUS and
Utils::Icons::PLUS_TOOLBAR

Change-Id: I2d5c69ec13ceba172c2c583895eea6fdff77a64e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-18 09:02:58 +00:00
Christian Kandeler
1e56179d0c QbsProjectManager: Consider qbs.sysroot for code model flags
This is particularly relevant on macOS, where we have an implicit
sysroot that's not exposed in the kit.

Change-Id: I85f6cd989e2f32857c007822fd68fbaf0cead7e0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-18 08:11:26 +00:00
Marcus Tillmanns
7c5e92f6fa CppEditor: Add missing include
Change-Id: I5a8724987e3c5888d5d07507cf2ae63a1b463c5a
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-18 06:33:44 +00:00