Commit Graph

62421 Commits

Author SHA1 Message Date
Thomas Hartmann
f4c6bf0179 QmlDesigner: Move QmlVisualNode::states to QmlObjectNode
This is required for StateGroup support.

Change-Id: I25d8f94c2a0fa9140ce8af3032bc92a7b858b9d8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-08-23 08:00:28 +00:00
Christian Stenger
635865dac4 QmlDesigner: Fix compile
Change-Id: Iab57aa9b78c73773ccdb66490ff2536b2a5465fd
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-23 06:27:46 +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
Knud Dollereder
aea64ca1fa Add zoom slider to the curve editors toolbar
Removed the "Set Default" button from the toolbar since
it does the same as the "linear interpolation" button
and space is rare in the toolbar.

Fixes: QDS-6951
Change-Id: Ifdbf20af2e5365e9bf9b592783b872394cabb7eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-08-22 14:31:08 +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
Ivan Komissarov
395e0560d4 Update qbs submodule to HEAD of 1.23 branch
Change-Id: I053b24ae7b03226de7bf1ffaf9d5424f123c620e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-22 13:46:38 +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
Mahmoud Badri
fc4ebb0cab QmlDesigner: Create a context menu for the 3D Editor
For now only 1 action is implemented (edit material), more actions are
coming next.

Task-number: QDS-7414
Task-number: QDS-7398
Change-Id: Id8e36c23d9a4d35ee94d55d3d6b15df78241a05d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-08-22 13:26:18 +00:00
Mahmoud Badri
86d1526564 QmlDesigner: Fix propertyGroups.json warning for 2D projects
Load property groups file only if Quick3D import exists

Change-Id: Idf7b95cb4efa34dde6196964e5e2cbad54341193
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-08-22 13:23:27 +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
Christian Stenger
3b73b27862 ScxmlEditor: Fix build with Qt5
Change-Id: I09609ac62604885f7800088619cbe1f4ea510d83
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-08-22 11:17:56 +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
765f632b29 StudioWelcome: Move plugin to "Utilities" category
People regularly report that they somehow got this plugin enabled in Qt
Creator, and one reason could be that they just enabled all plugins in
the "Qt Quick" category (e.g. by clicking the checkbox for that
category). Separate this plugin from the group.

Task-number: QDS-7449
Change-Id: I0a6e7ee7bc1a59cb2cd2fc28bc037fc62e184315
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-22 08:17:15 +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
Jarek Kobus
5e6ad51e97 ScxmlEditor: Fix a crash when closing scxml editor
Don't iterate on m_overlappedItems inside d'tor, as every
iteration calls removeOverlappingItem() and it modifies
the container being iterated. Do the same for m_outputTransitions
and m_inputTransitions.

Amends 8b444f88eb

Fixes: QTCREATORBUG-28027
Change-Id: I78fe67b5ea584c969e4850a2db3f00d981296865
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-22 08:03:43 +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
Thomas Hartmann
dc8e13995a StudioWelcome: Scale down splash screen if it does not fit
If the splash screen does not fit on the screen we have to scale it down.

Task-number: QDS-7449
Change-Id: I73018563e9f863d3a8f60facf7599590fb602f0f
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>
2022-08-19 12:05:00 +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
Thomas Hartmann
00679f2af2 StudioWelcome: Only disable welcome screen if download is started
Task-number: QDS-7448
Change-Id: Ic239ba4e5ff4549642cbcb38ab823331dee64308
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-19 06:46:48 +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
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
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