Commit Graph

72811 Commits

Author SHA1 Message Date
Thomas Hartmann
12bbc785a6 QmlDesigner: Only allow a very limited number of imports
Only allow a very limited number of imports for QML lite designer.

Change-Id: I4f96252fe66be53aa5da26ef9d6cb4509e6ec6d9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-07-11 08:02:03 +00:00
Marcus Tillmanns
15c5337649 CmdBridge: Improve error handling
The message result type was checked, but the promise
was still finished without an error.

Change-Id: Ib5ba5f48202073a82bfbcb871e0d5a5277ea9f2a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-11 06:29:31 +00:00
Eike Ziller
e46ee312dd Add some key event logging for OpenEditorsWindow
On some platforms/configurations the popup for switching documents does
not close when releasing the modifier key. Add some debug output to try
to find out what happens.

Task-number: QTCREATORBUG-27378
Task-number: QTCREATORBUG-31228
Change-Id: Ia882ce6be1bd235601f9c869b79fb8c15ab72a3a
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-07-11 06:27:33 +00:00
Marcus Tillmanns
580e2c379a CmdBridge: Fix removeall result type
Change-Id: Idd428d2eb1f3a41a72b4cd90b4669b381c729d3b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-11 06:03:44 +00:00
Alessandro Portale
d134b7b5ce Android: Remove obsolete AndroidQmlPreviewWorker
This change remove the AndroidQmlPreviewWorker which was only used in
QDS and is now (QtC 15 development cycle) obsolete in that context.

Fixes: QTCREATORBUG-31221
Change-Id: I2e361c8245f70178fb0f0e3e1c0a9499d783856d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-10 18:11:09 +00:00
Jarek Kobus
2d480f45da Android: Use task tree for startAvd() action
As a drive-by, lower some timeouts from 2s into 1s.

Change-Id: I495ad20058b0f97b6cdd5271a390b779c66b4864
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-10 16:14:20 +00:00
The Qt Project
dd44168ad5 Merge "Merge remote-tracking branch 'origin/14.0' into qds/dev" into qds/dev 2024-07-10 16:13:44 +00:00
Tim Jenßen
93588dbee2 Merge remote-tracking branch 'origin/14.0' into qds/dev
Conflicts:
	doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
	qt_attributions.json
	src/libs/sqlite/CMakeLists.txt
	src/plugins/qmldesigner/CMakeLists.txt
	src/plugins/qmldesignerbase/QmlDesignerBase.json.in
	src/plugins/qmlprojectmanager/CMakeLists.txt
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h

Change-Id: If33e41d8951a49acaba0a74c3e5848eef52bb945
2024-07-10 18:11:28 +02:00
Alessandro Portale
a7dec9f327 ProjectExplorer: Use LayoutBuilder for AbiWidget
Change-Id: Icea50ff1f3a076c860712d3f08d669fde58b7102
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-10 16:10:15 +00:00
Alessandro Portale
3775750a80 CMakeProjectManager: Use LayoutManager in CMake tools settings page
Change-Id: Ied210a8311e8d83cb44056d544308c19930b479f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-07-10 14:46:48 +00:00
hjk
386e3c3c12 QmlJsEditor: Use a SelectionAspect for the open mode choice
Change-Id: Ieac7371bfa71dfc5387e442d717eb53a4fae6fb8
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
2024-07-10 14:33:36 +00:00
hjk
32547b47a7 Utils: Add a way to use SelectionAspect item data as settings value
These can be more descriptive than the index integer.

Change-Id: I0d992fdcfa13258c62f66056d61d9a4659272563
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-10 14:13:07 +00:00
hjk
04f309f760 Utils: Fix two deprecation warnings
QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const;
    QT_DEPRECATED_VERSION_X_6_0("Use actualSize(size) instead")
    QSize actualSize(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const;

Change-Id: I6f70d148afb5b3fb4f3ab7ee86f2d5eba6618ac5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-10 13:54:01 +00:00
hjk
9454c5c0e6 Welcome: Hide most of UI tour implemenatation in .cpp
Also, de-Q_OBJECT-ify, for slimmer interface.

Change-Id: Icfa80430c95318351f3ab9bfb46c3d03d9d02af3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 13:53:45 +00:00
Eike Ziller
f6e99a6235 Remove Linguist related external tools
They do not work with CMake projects

Fixes: QTCREATORBUG-28467
Change-Id: Ic656c28d0e6bdde976bf7ffd75796b51c1aba06a
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-07-10 13:50:33 +00:00
Eike Ziller
e7e0f80d01 Fix tab order in find toolbar
Explicitly add the options button to make sure that is at the correct
position, and do not use multiple conflicting methods to specify tab
order. This adds the various buttons back into the tab order.

Fixes: QTCREATORBUG-30791
Change-Id: I5d1fbcd213b57bf4d7af98ba5d21b09e408e84b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 13:50:12 +00:00
Alessandro Portale
0222dd7066 Core: Use LayoutBuilder for change log dialog
Change-Id: I0b0678dadd57b2873cf0c8ea2c6fe1cb3370d8ae
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 13:48:55 +00:00
Jarek Kobus
5aea1a817a TaskTree: Make most of TaskAdapter subclasses final
Change-Id: Ie6652c6f327b5a47b3a4cab58e64fbea0cb71276
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 13:39:54 +00:00
Jarek Kobus
779390829c TaskTree: Introduce For element
Improve code readability by requiring iteratable Group
to be named For.

The For's c'tor requires an iterator element as a first arg.

The For's c'tor allows for passing exactly one iterator element.

It's not possible to place iterators inside Group element anymore.

Change-Id: I9dfe2c0da058abac161f66c4e336da2417c383f1
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 13:39:40 +00:00
hjk
c841a99db9 ExtensionManager: Streamline mode widget setup a bit
Change-Id: Ic6ec02c07cd37ee2a3b3b2d45b9239b22873a6cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-10 13:19:51 +00:00
hjk
1c17370146 Core: Add a way to delay-construct mode widgets
... and use it for edit mode.

There's currently no real effect as the mode bar population in
ModeManagerPrivate::extensionsInitializedHelper() accesses all
IMode::widget() and triggers the creation, but in principle we
could pass the functor instead of the widget down to and store in
FancyTabWidget and only use it when a mode gets activated.

Change-Id: I4c4a276bc025abce1ff47c68b060c67b5c8e5170
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-10 13:19:17 +00:00
Christian Kandeler
978042b582 CppEditor: Use a timeout in waitForRehighlightedSemanticDocument()
As in all the other wait() functions.
This makes sure we never hang indefinitely in tests.

Change-Id: I119cc0d6d6146f193ffde37207a94f61b3c70d87
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 13:10:26 +00:00
Jarek Kobus
6c39e136fd Tasking: Introduce TcpSocketTask
Change-Id: I9640a7016dd833394a1e62be93af129f517ae1a2
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 12:39:58 +00:00
Marco Bubke
4046f47174 QmlDesigner: Use error notifier for property type name resolving
We can polish it later. But so far the architecture works and the
problematics cases of missing types is handled.

Task-number: QDS-12761
Change-Id: Ifb55a5772fddfa7719a4d690b24b0539679f79ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-07-10 12:29:56 +00:00
Marco Bubke
55fed73ee4 Sqlite: Fix instable return values
References into vectors are instable because the vector can be
reallocated. std::list \provides stable references to entries. In  the
future std::inline_vector is maybe a better option.

Change-Id: I76ac3005259ef9d09f3b8c226dbfd48433aa48b9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-07-10 12:29:35 +00:00
Cristian Adam
e451f42fc7 CMakePM: Use FilePath::path() instead of toString()
Amends 412eeefafa

Change-Id: I82fa1eadd61a4acc2ab25499ef16dd40ef284942
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 12:00:05 +00:00
hjk
b17b6f61e5 QmlJsEditor: Further aspectify settings gui
Change-Id: Ia14289a414e23c6e830d88bbfe0a69577c0f2a31
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 11:49:39 +00:00
Henning Gruendl
7b0b0deb84 QmlDesigner: Hide ADS for lite designer
* Adapt top toolbar by removing lock button and workspace combo box both
  in toolbar and flyout
* Add lite mode bool to dockamanager in order to lock workspace by
  default and skip config parameter
* Add new flag to ADS to block context menu on DockWidgetTab
* Hide workspace menu in view menu
* Deactivate middle mouse button and close button on DockWidgetTab

Task-number: QDS-13169
Change-Id: I3158c9d7eaef1a58520dc466e85a859e074d1c9e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-07-10 11:27:28 +00:00
Christian Kandeler
b8534db8dd ProjectExplorer: Fix missing model -> editor sync
... when enabling/disabling an environment variable via the buttons.
This was forgotten in 8ef85e481a.

Fixes: QTCREATORBUG-31222
Change-Id: I02f2840cd0dadc628120275585245f8d1c23cec8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-10 10:18:17 +00:00
Christian Kandeler
112e93b1be RemoteLinux: Allow transferring directories
Fixes: QTCREATORBUG-31136
Change-Id: Ic9e5d57ba5f5e85efe5db58719f38f0702ac3492
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 10:17:37 +00:00
Alessandro Portale
d9f48dab27 CppEditor: Use LayoutBuilder for InsertVirtualMethodsDialog
Change-Id: Ie9c03508f2d60f66b55591deb5fdfdf1be8e27df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-10 10:01:17 +00:00
Thomas Hartmann
ea5a5b7f1c QmlDesigner: Add commandline option for QML lite designer
Change-Id: I5bcb19b5664b9ffe8e113d51371b3858c5c7aa6a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-07-10 09:58:05 +00:00
hjk
317a985dd6 Debugger: Create separate class DebuggerModeWidget for mode widget
Change-Id: Iaf8d2f2b9bfaf80f2b3b231638c1609503f7850f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-10 09:29:24 +00:00
hjk
6c7a7db87b Core: Create an EditModeWidget class
A step towards having delayed mode widget construction.

Change-Id: I1d400e058d17aaebfc784000d8b2705debea6a51
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-10 09:28:40 +00:00
Marcus Tillmanns
0405801f17 CmdBridge: Implement clean exit
Change-Id: I248fbe5a24f55f6d7ba9ea8e0093eda702baaad1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 09:26:15 +00:00
hjk
495418d4c4 CMake: Simplify CMakeBuildSettingsWidget::kitCMakeConfiguration()
Change-Id: Ie64500c42128f5e38ebdd83b0853a016e36cfc0d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-07-10 09:21:53 +00:00
David Schulz
3d37e20dd6 Core: add convenience function generating a documents context menu
Change-Id: I1f00bccf3c24d0bde8764277e1cfb4ef0c6e758b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-10 09:16:40 +00:00
David Schulz
5382d735fb Core: allow pinning documents from the editor toolbar
This is now inline with the context menu of the open documents view in
the open documents view in the side bar.

Change-Id: I026f94e0296d0704382bb49790226608503ef94f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-10 09:16:24 +00:00
Marcus Tillmanns
d30ddb101f Docker: Use kill to stop container
Calling "stop" often times takes a while or outright fails to stop
some containers. "kill" is more reliable.

Change-Id: I46a33c8f4e38aa9a71b1f64d74042433f7a90ccc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 08:32:42 +00:00
Jarek Kobus
84171887bb QmlJsEditor: Remove warning about unused variable
Change-Id: If67c3330130a90b84f593cb8a83999f47f3849e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 08:26:27 +00:00
David Schulz
0cfdf2f5ae LanguageClient: show unreachable servers in the lsp menu
Task-number: QTCREATORBUG-31125
Change-Id: I6526955fe4e3d65c6d83b88876eb47692d694955
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 06:42:34 +00:00
David Schulz
3b5547214c LanguageClient: add state changed signal to client
Change-Id: I13b69eb386b4e356f4f23c3b464f83a2a1d9ab14
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-10 06:41:59 +00:00
Eike Ziller
e1560a3c7c Make mode hiding and style available from mode selector
Add the View > Modes menu as a context menu to the mode selector in the
emtpy areas. Add a context menu with "Hide" and the mode style to the
modes that don't have a menu, and extend existing mode menus (Debug
mode) with these items too.

Change-Id: I28106d9b6c4f0d69b2d06c4ec9664eb67e2b1216
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 06:06:41 +00:00
Eike Ziller
d386421998 Move actions for mode style to mode manager
Change-Id: Ic3ea8dcc12511f0f115b0c9124419ac5178f5c8f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-10 06:06:11 +00:00
Eike Ziller
a555bc3801 QmlDesigner: Remove special completion action
It was necessary to override the existing completion action, because
that would always work on the current editor in the editor manager
instead of on the text editor in Design mode.
(Though instead of changing the context for the TextEditorView, the code
could just have registered a context for the text editor widget itself
for that purpose.)

Since 411100b037 the text editor widgets
have their own individual contexts and actions, without the detour via
the editor manager, so this workaround is no longer needed.

Change-Id: I7e2b18dd7b953a56b5f2c99152d2eeabdb76f726
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-07-10 06:05:54 +00:00
Marcus Tillmanns
30e44ae15f Docker: Improve error output when bridge fails to start
Change-Id: I86d9d3972c483d21cd2ff64d3581b518e6b0a819
Reviewed-by: hjk <hjk@qt.io>
2024-07-10 05:52:12 +00:00
Marcus Tillmanns
cba0f779a9 Terminal: Add error checking
Change-Id: I28395f50f03b853468a229416d5942fc591f9957
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-07-10 05:51:57 +00:00
Marco Bubke
ae50f706bf QmlDesigner: Move unrelated files out of model
Move them to their own sub directories.

Change-Id: I643cf18a862cdbea868e25070e3015ed7e739d46
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-07-09 19:49:16 +00:00
Cristian Adam
6c63c42799 CMakePM: Do not open CMakeLists.txt for adding/renaming/removing files
Other build systems like qmake / qbs do not do this.

Change-Id: I615ea3556c694e7a18426558c5bf6f3ea142068d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-09 14:46:37 +00:00
Alessandro Portale
c9d5504fa5 ExtensionManager: Add filtering and sorting
As per UI design spec, this change inserts two widgets between the
search field and the extensions list. One for filtering, one for
sorting.

The widgets are derived from QComboBox, with custom paintEvent. The
selected filter/sort options are applied to the custom
SortFilterProxyModel which is inserted between the "search" proxy model
and the view.

Fixes: QTCREATORBUG-31179
Change-Id: Ia7768fa4f31b5bf5682918e724a3a299e851eb46
Reviewed-by: hjk <hjk@qt.io>
2024-07-09 13:09:40 +00:00