Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
962d9d55d0 Utils: Also allow FilePathAspects to auto-register
Task-number: QTCREATORBUG-29167
Change-Id: Iba301764072cc1ca3d3a335a8106ab121733b387
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-23 14:55:36 +00:00
hjk
b3f7478373 Coco: Use FilePath::searchInPath instead of Environment::searchInPath
Not obviously better in this case, but I'd like to centralize
searching on the FilePath side.

Change-Id: I27cec97c0590cf27c3659b3aa262b86439670679
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-23 14:08:22 +00:00
Alessandro Portale
b1957888dd WebAssembly: React to AspectContainer::applied
... instead of overriding IOptionsPage::apply()

Change-Id: I00d30de7d604409be753eb8b9f668c24790e0a49
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 13:19:13 +00:00
Eike Ziller
5ac582a9b6 Remove usage of SessionManagerPrivate from project explorer
Change-Id: Ia12a9ba2d9e65605715110ea0330d5c1e1cae7c6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 13:14:04 +00:00
Eike Ziller
2726f7716f Move function to show session manager to SessionManager
Change-Id: Ibcaae8c4fb68fe6b43759c11b77bfaab73d41745
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-23 13:13:34 +00:00
hjk
b41f7e87ae ProjectExplorer: Make ProjectConfiguration an AspectContainer
... instead of having one. AspectContainer are de-factor (q)objects
with "fat" properties, conceptionally not much different from QObject
itself, so there's not real need to differentiate between the QObject
interface and the (forwarded) aspectcontainer interface.

As a side-effect, this saves one QObject base object per instance.

Change-Id: I6eefe739b3aebcef1ece196ff8d70aa36738997b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-23 13:04:28 +00:00
hjk
79dd2a8c8b CMake: Use new FilePath::searchAllInDirectories function
Change-Id: Idd696603548d7504ff87152e9125667dca4c42ab
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-23 13:03:08 +00:00
hjk
3ecaabf5e9 CMake: Use a FilePathAsepect for the staging directory
Change-Id: Id4ac0cdaa3a773f740f474e78a7af104996a5504
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-23 12:54:37 +00:00
Leena Miettinen
a0f64b133d Doc: Fix qdoc warnings in aspects docs
Add \a commands and mark things \internal if qdoc cannot find them.

Change-Id: If7a9303e5053af4eb58a08caafd53ffa6ee604b5
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 12:51:01 +00:00
hjk
f952fe30e7 Conan: CPaster: Use FilePathAspect
Change-Id: I982ae4115af818cc25c46acc84713e7432b18548
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-23 12:49:55 +00:00
Leena Miettinen
b6a1935562 Doc: Fix qdoc warning caused by a changed argument name
Change-Id: Id2f28994f6cd1829bfc4bdc23c87aabe40f44f2c
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 12:44:10 +00:00
hjk
ae26fa0dd7 Utils: Add a FilePath::searchAllInDirectories
A variation that does not stop on the first found item.
Useful for auto-detection scenarios.

Use "WithAnySuffix" as default to cover .cmd and .bat etc.

Change-Id: I48f36eff06699c046e34c8e2646546bcff20ae8b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-23 12:42:27 +00:00
hjk
27a63b0930 Valgrind: Also search in path before chickening out
Amends db2b09f4eb.

Change-Id: I1134fe2bc9441c12924332bb2666f108eb2f0d32
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-23 12:21:24 +00:00
hjk
cdf1926215 Valgrind: Use FilePathAspect for main executable
Change-Id: I0bdb625b47d0f39b577684b6f407b9e8a6086d1f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-23 12:13:41 +00:00
Marcus Tillmanns
c7bce14525 Terminal: Axivion warning fixes
Change-Id: Iae048d53c64c2c42fa14e425b5de11e0bf1a59d3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-23 11:10:57 +00:00
Alessandro Portale
48792c07a5 Revert "Android: Use direct member for aspect"
This reverts commit ffd0f7306b.

Reason for revert: Breaks build. Revert is temporary, will be reapplied
after I6eefe739b3aebcef1ece196ff8d70aa36738997b is in

Change-Id: I5029f710656fb89eeaf65b55742678938f249aeb
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 10:28:19 +00:00
hjk
b4185f04aa Android: Hide AndroidRunConfiguration implementation
Expose the factory, that's how most other places are organized.

Change-Id: Ia6e088b70a6c5ee3b18b67e852619e922c95f781
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-23 09:48:33 +00:00
hjk
ffd0f7306b Android: Use direct member for aspect
Change-Id: Ia925522e15452e15a8a89803a591db6a4b18540b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-23 09:46:12 +00:00
Leena Miettinen
e45609194d Doc: Remove period from the end of \sa
The HTML generator adds it automatically and qdoc warns about it.

Change-Id: I3917d7d23b16446e28ce7bfeb8f9195f21efd7fc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-23 09:31:53 +00:00
Leena Miettinen
ce0ab1cd27 Doc: Replace \p with \a and remove \param
The qdoc command for arguments/parameters is \a. It is enough to
place it somewhere in the text to make qdoc happy.

Change-Id: I164fbd63277787a68b0216ad3fbbed768b975d91
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-23 09:31:32 +00:00
The Qt Project
f4c4ab73a1 Merge "Merge remote-tracking branch 'origin/master' into 11.0" into 11.0 2023-05-23 09:20:01 +00:00
Christian Stenger
0c0fb744e0 Utils: Fix missing include
Change-Id: I98e5a00f9f4f09cc9c09f3d0436ba5dfc20e3b31
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-23 09:04:16 +00:00
Marcus Tillmanns
69c81e8a65 Terminal: Fix case insensitive search
Case sensitive / case insensitive were set the wrong way around.

Change-Id: I7ed689684972aae5f6b1af2f35d9fd72d2df71e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-23 09:03:57 +00:00
David Schulz
d63c57ef47 CodeAssistant: do not schedule processor deletion too early
Calling displayProposal might spawn another eventloop that potentially
deletes the processor before the async proposal handler finished.

Fixes: QTCREATORBUG-28989
Change-Id: I3a8ddb9180cb7737a37ea39dc59d922e83615ed6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-23 08:47:45 +00:00
The Qt Project
34f4632228 Merge "Merge remote-tracking branch 'origin/11.0'" 2023-05-23 08:42:21 +00:00
Christian Stenger
590a6904b1 QmlDesigner: Fix qbs build and building with Qt6.2
Change-Id: Ic114c9eb830eed5cf0bef890007408694453791e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-23 08:40:09 +00:00
Eike Ziller
3dc5bbfa1f Merge remote-tracking branch 'origin/11.0'
Change-Id: Ic7bd1fb91f46c5f8fef47b2c442382186aeb7ad3
2023-05-23 10:17:31 +02:00
Eike Ziller
ff09ebf4f2 Merge remote-tracking branch 'origin/10.0' into 11.0
Change-Id: I707e562f44af0cb541fb94feb3963097aca7ad12
2023-05-23 10:15:42 +02:00
Leena Miettinen
9c6e3b724a Doc: Add \brief commands to namespace docs to show them in tables
...and at the top of the topics.

Change-Id: I3d521a351e06d765a79304db897c5cffa9fee0df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-23 07:39:39 +00:00
Christian Kandeler
8e7ad13ad2 Fix qbs build
Was broken in an impressive number of ways by latest Design Studio
merge.

Change-Id: I25f56827074a8c16a1a9c18884e1f63e8eaf6ef1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-23 07:24:49 +00:00
Leena Miettinen
f776f6f3ec Doc: Add Layouting namespace to make its classes' docs visible
Change-Id: I3b713f4c9bd65f279e41368ce5ce1a25ea17f176
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 07:22:36 +00:00
Eike Ziller
ee6789c523 Centralize a PluginManager::isShuttingDown() status
Instead of keeping track of this in plugins individually.

Change-Id: Ia2650f0f647d4a63d2010cef688aa56f6020c338
Reviewed-by: hjk <hjk@qt.io>
2023-05-23 07:19:42 +00:00
hjk
323c58fd20 ProjectExplorer: MakeStep code cosmetics
Remove unneeded #include and an unused variable that was scheduled for
removal for a while.

Change-Id: I5ec82a302ed20f14d46c665325cde7dccc9e3361
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-23 07:19:00 +00:00
Eike Ziller
0dbff2ece5 Separate session saving from project manager
Move the generic parts to session manager and let the project manager
save its parts separately via SessionManager::setSessionValue.

Change-Id: Iec2e81ea2488a15efc7333adb2b327761afdf274
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-23 07:18:37 +00:00
hjk
c02750428c Utils: Rework FilePath::searchInDirectory
Avoid the detour through Environment::search* by copying and adapting
some code. Long term the Environment::search* functions may go
as FilePath is generally a better entry point into the remote
world nowadays.

Change-Id: I352d6fb68292d76f29a3454a786322bfe081d53d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-23 06:54:44 +00:00
hjk
eebe7f86f3 Fossil: Use a bit more FilePath{Aspect}
Change-Id: Ie7c995585aafe03428dc5e93b2904b189f0319c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-23 06:12:42 +00:00
hjk
a4c962aa33 Utils: Introduce aspect ctors referring to an "wrapping" AspectContainer
This removes the need to manual 'registerAspect' calls in most cases.

Whether the containers owns the registered aspects or just references
them is still determined by AspectContainer::setOwnsSubAspects()

Change-Id: Iadd17c919287f625bf5eb4964de4149d4da5a0f9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-23 06:08:35 +00:00
The Qt Project
6d134444ea Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-05-22 21:28:35 +00:00
Tim Jenssen
1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
2023-05-22 21:13:40 +02:00
Alexander Pershin
db1d12f69a MiniProjectTargetSelector: Natural sorting of entries
Change-Id: Ibad929d1423d964204b4b236e1cc4df7e0614889
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-22 18:33:56 +00:00
Marco Bubke
df7398e2c5 QmlDesigner: Add virtual destructor to silence warning
Add copy and move constructor ... to adhere to rule of five.

Change-Id: Ib56c229b45df2304694b51b4aa51aea8a20073d9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-22 16:12:46 +00:00
hjk
3dcdbe9069 FancyLineEdit: Mark placeholder text that doesn't pass validation
... also for place holder text. While this omission was apparently
intentional, the opposite behavior was used in the Beautifier settings,
arguably being a better standard as this makes clear to the user
that the pre-selected placeholder value won't be ok to use.

Change-Id: Iaf15b1351de929dee57329efdf18d7e831b4f8bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-22 15:31:39 +00:00
Marco Bubke
5eba056b73 QmlDesigner: Add callbacks for model resource management
As a node or property is removed there are now callbacks to generate
node, properties and expressions which should removed or adapt too.

Task-number: QDS-9766
Change-Id: I6d842006a6282af00ff644ffaa0f3102e14f13fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-22 15:19:55 +00:00
Leena Miettinen
231397efe2 Doc: Fix qdoc command to "\a env"
To fix a qdoc warning. However, qdoc cannot find the function to
bind these docs to in any header file.

Change-Id: I86b88bbd9e6f0731f8f79587981c46b720b4a91f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-22 13:57:36 +00:00
Christian Kandeler
0ddbf9f6b8 Update qbs submodule to HEAD of 2.0 branch
Change-Id: I5e8f30c4eefbddd2660e5b68b8a13837c70cdfe4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-22 13:50:06 +00:00
Leena Miettinen
1467aedb8d Doc: Turn docs for DeviceShell::DeviceShell() into a comment
The notation was causing QDoc errors, and according to the developer
this is more like a comment to other developers than documentation.

Change-Id: Ibbf3f64252f164c361315f8ecf16e3422703bb1c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-22 13:13:02 +00:00
hjk
4de56e2683 Beautifier: Use Aspects for part of settings
Change-Id: Icff60f5f1292ae6b2de2ce757d645d5fec47bcc6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-22 13:07:36 +00:00
Leena Miettinen
8c288bf05f Doc: Add "\inmodule QtCreator" to \class and \namespace docs
To get rid of QDoc warnings.

Change-Id: Idd39b7ae4327798c376f424c94d6617bcaee2258
Reviewed-by: hjk <hjk@qt.io>
2023-05-22 12:48:35 +00:00
hjk
5e059db065 CMakeProjectManager: Robustify buildAndRunOnSameDevice helper
Change-Id: Ib3559f81f2ff71ad5fc04d982ad6286df0d4390e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-22 12:48:27 +00:00
Alexander Pershin
cb05304858 MiniProjectTargetSelector: Ensure selected item is visible on show event
Is useful when project contains large amount of targets and you have
to switch between them more or less often. Change also applies to other
tree views in selector but they are less likely to contain large
row counts.

Change-Id: Ic2cd920335adeef618d85202b3347a4cd042871c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-22 12:43:57 +00:00