Commit Graph

85691 Commits

Author SHA1 Message Date
Cristian Adam
0445bef1c8 CMake: revert QTC_ environment variable usage for preset
Amends 85ed23e639537d7f9e473c0fd3d016075433a225

Keep the hidden part, but the usage of "QTC_BUILD_PLUGINS" :
"$penv{QTC_BUILD_PLUGINS};Terminal" doesn't work because the parent
environment will be used and not the ancestor preset's environment.

Terminal will have to be enabled in the child presets via
`"BUILD_PLUGIN_TERMINAL": true` in the "cacheVariables" section.

Change-Id: I73c850a47d075a639810ed3aed5ceeb2e25b18de
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-05 17:26:28 +00:00
Cristian Adam
0fde41906a CMake: Fix CMakePresets.json
Syntax error, trailing comma.

Amends 85ed23e639537d7f9e473c0fd3d016075433a225

Change-Id: I972099822c3a0ac682e3d1b5fe8f63ae92ad8d1d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-05 17:00:28 +00:00
Cristian Adam
91222c3a81 CMake: Fix the minimal configure preset
By default hidden, so a user will have to have a `CMakeUserPresets.json`
file to inherit from it.

Changed `BUILD_PLUGINS` and `BUILD_EXECUTABLES` as environment variables
prefixed with `QTC_`. Qt Creator's CMake API will check these
environment variables.

Having them as environment variables allows a `CMakeUserPresets.json` to
expand the list like:

```
"environment" : {
 "QTC_BUILD_PLUGINS" : "$penv{QTC_BUILD_PLUGINS};Terminal"
}
```

With `cacheVariables` this is not possible.

Task-number: QTCREATORBUG-29137
Change-Id: I925038d90806036abe4610e5c864b72d32960076
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-05 16:24:35 +00:00
Haowei Hsu
745346cf31 .gitignore: Ignore CMakeUserPreset.json
And add a template of CMakeUserPresets.json for
building on Windows platform in README.md

Fixes: QTCREATORBUG-29137
Change-Id: I359a9894e448acb1203de0c6acfc508e65655c03
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-05 15:44:35 +00:00
Marcus Tillmanns
f02d0354c4 Terminal: Dont show process exit code
Show it as a "flashing" message instead

Fixes: QTCREATORBUG-29373
Change-Id: Ib9e7280a1b80cc52835aecb954f80e9daa80f7ca
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-05 15:39:29 +00:00
hjk
02ac595a2e LayoutBuilder: Add some playground for potential implementations
Change-Id: I0955c503dc03f9e4d81d6cfe4df7af63cf86a638
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-05 14:26:06 +00:00
Cristian Adam
fe8c276d11 CMakePM: Auto detect generator when not specified in presets
Qt Creator would do a compiler probe for CMake presets when the compiler
was not set.

But the same needs to be done when the generator is not set. Otherwise
Qt Creator would set a different generator by default. On Windows is
"Ninja".

This is different from what CMake does from command line.

Task-number: QTCREATORBUG-28693
Change-Id: I96e917b11561a042f9476bad302f3f153e37bafd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-05 14:02:48 +00:00
Leena Miettinen
a0f0f9c69b Doc: Update tutorials
- Use \ingroup creator-tutorials to group tutorials
- Use \annotatedlist to automatically generate tables that list tutorials
- Add \brief commands to add descriptions to the tables
- Remove some leftover descriptions from the Qt Quick Application
  wizard template docs
- Fix references to UI text
- Write "you" instead of "we"
- Use curly braces to define alt text for images
- Some language fixes

Task-number: QTCREATORBUG-28996
Change-Id: I4b611319b6867cae11d613e0a4d075923cdb037e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 13:48:04 +00:00
Alessandro Portale
f373297af2 Vcpkg: Polish search/add package dialog strings
...as suggested after UX review.

Change-Id: I9f96d919a46c9e1a33e3396aca878bb520464f33
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-05 13:41:56 +00:00
Cristian Adam
6235d9b8cc CMakePM: use string form for architecture / toolset preset fields
Documentation mentions:

"Each may be either a string or an object" and "If no strategy field is
given, or if the field uses the string form rather than the object form,
the behavior is the same as 'set'"

Task-number: QTCREATORBUG-28693
Change-Id: Idd8cdffb94e9a943e0b133a63c628d9d8d54eb20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-05 13:28:28 +00:00
hjk
739f835ef1 ProjectExplorer: Remove unusual {Arguments,WorkingDir}Aspect
Follows suite to 2cc4967 to have the user side code more uniform.
Most of the extra verbosity (setMacroExpander) can go away again
when distributing the expander via the "owning" AspectContainer.

Change-Id: I9e80cb235f0a4a9ebee601dd638aefbaa41efc1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 12:55:31 +00:00
Alessandro Portale
b4dd53f9fe Vcpkg: Fix the plugin string translation context
It is supposed to start with "QtC::"

Change-Id: I9cb0b34bc7c42b4cfb58753ceb36db532e2236db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-05 12:53:25 +00:00
Christian Stenger
cdea404957 SquishTests: Fix welcome page test
When the view is populated and sorted it gets its items
one by one. If multiple matches for opening an example are
possible we may end up using the wrong one which in turn
makes the test error out. So, wait for an expected amount
of items.

Change-Id: If6f6abfa757ede33311a8e617ab7d570df1240a4
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-05 11:57:05 +00:00
Leena Miettinen
707d3dd7aa Doc: Move sidebar view docs into separate topics
- Link the topics from "Show and hide sidebars"
- Hide "Working in Edit Mode" from QDS because the Edit mode is
  hidden by default there
- Fix links to the new topics and remove links to
  "Browsing Project Contents"

Task-number: QTCREATORBUG-29361
Change-Id: Ia9ae6474bf0925a76f9ccee693369d2460b9266f
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-07-05 11:28:16 +00:00
Leena Miettinen
72c401d9ce Doc: Add a disclaimer about disabling plugins
Change-Id: Ib75b4e88c24ad13693ef02e76de74ba23dcb9e04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-05 11:19:17 +00:00
Jarek Kobus
7e0534c301 ClangToolRunWorker: Remove unused fields
Change-Id: I599196e436d1648dff386555ec5537a21de9fc35
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-07-05 11:18:03 +00:00
hjk
79bf7873bd RemoteLinux: More direct aspect use in RsyncDeployStep
Change-Id: Iaa34dba82189f78e88dd09585ada9b36ec3f2852
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-05 11:15:48 +00:00
Marco Bubke
ef8dcbdfa8 StudioWelcome: fix signedness warning
Change-Id: Iffa90513ce0cbb0df5480a59bdf371c1d6da5a00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-07-05 11:05:01 +00:00
Henning Gruendl
13c0fd2a0c QmlDesigner: Add title bar icons to icon font
Change-Id: If4b094723f0638f4e09f9b42312e0d14400e6067
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-05 09:31:51 +00:00
hjk
ada4429bcb RemoteLinux: Simplify GenericDirectUploadStep
The IncrementalDeployment::NotSupported was alwasy overridden with
Enabled or Disabled before actual action started, so it was not more
than a bool.

Change-Id: Ia4e986d08cdd10e20a741868ecb43e0c7ed4bf33
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-05 09:24:19 +00:00
hjk
886ef1e262 RemoteLinux: Use aspects more directly in GenericDirectUploadStep
Change-Id: I3e9070eaf0ec0eef6a706e06a87083bd214d652e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-05 09:23:54 +00:00
David Schulz
1dbeb17841 Editor: Fix painting overlay selection
The border around the selection overlaps the line rect, so in order to
correctly repaint the selection when scrolling we need to widen the
prefiltering of painted selection.

Change-Id: I953749571e3e9ae412bf05f47ab3c4c3bfb8861e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-05 09:22:11 +00:00
Christian Stenger
c6a8a76be0 Fix Qbs build
Change-Id: Ic02f12a08990bfa9eb3f0131141407373248bae1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-05 09:21:08 +00:00
Christian Kandeler
ae7b6b8ecf CppEditor: Fix test
Amends 3f61223c0f.

Change-Id: If5b0ed3c1c93914ebdd684f75e2900653ecaf7d7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-07-05 08:59:06 +00:00
Christian Kandeler
c732667838 QmakeProjectManager: Prevent infinite loop on ABI change
Fixes: QTCREATORBUG-29204
Change-Id: I6f4e4fa96f6c48dc83f0e5baf2205421b9ff67ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 08:58:38 +00:00
Orgad Shaneh
2f6f9d2d33 Terminal: Add icons to tabs
Change-Id: Id219366de16944daf83c3eb154d6b087c79b7fd9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-05 08:45:12 +00:00
Marcus Tillmanns
f23103467a Terminal: Remove unnecessary echo
Fixes: QTCREATORBUG-29354
Change-Id: Ie6ddd127fecef3f48e56ca17335b21afaab31365
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-05 08:28:17 +00:00
Orgad Shaneh
9a7f45cc46 Terminal: Allow the underlying application to set title
Change-Id: I3530d645f16047df2546902d900e5e2fee8d071c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-05 08:26:39 +00:00
hjk
1bd2e84f9a Meson: Filepathify some parsers
Change-Id: I403a78e6a05a531b7ab8b5779fe9f87b0e01fc1d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-05 07:01:36 +00:00
Artem Sokolovskii
1fc0ca5277 DAP: Add CMake support to DAP engine
Added CMake support to the DAP engine in Qt Creator.
This feature can be enabled by setting the environment
variable QTC_USE_CMAKE_DEBUGGER. CMake debug session can
be started by clicking "Run CMake" or "Run".

Note:
Doesn't work with "Run debugging" in this patch.
Works only with cmake 3.27.0 and newer.

Change-Id: I756ea57f507aa4a6621ad62a8c0ef52c44a5185d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-07-05 06:59:49 +00:00
Mats Honkamaa
aa7628f754 Doc: Add info about Effects in Content Library
Task-number: QDS-9841
Change-Id: I9830b87961ea9f650f02526e0a6f26c4787db6f8
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-07-05 06:42:17 +00:00
Christian Stenger
52bc1578e5 QmlPuppet: Fix build
Change-Id: Ieb459d5dbab7ceba3965a1657b2411cbacac258a
Reviewed-by: hjk <hjk@qt.io>
2023-07-05 06:25:17 +00:00
Eike Ziller
3f912c01fb Doc/Extending: Update "getting and building" page
qmake files were still referenced.
Do not focus on building Qt Creator, we ship a development package
nowadays which is preferred.

Change-Id: If209f48c0fcf4f8fbe87ecaddae826ad3a63c209
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 06:10:57 +00:00
Eike Ziller
3b4a852637 German translation: QmlJS(Editor|Tools|Preview|Profiler)
Change-Id: I2643131f416f0c8cd60766882faba07a337e5f25
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 06:10:36 +00:00
Eike Ziller
fbdbaa8a84 German translation: Utils, Valgrind, VcsBase
Change-Id: Ib0fa7a241450c9ceabef746b83b4df533e60875c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-05 06:10:26 +00:00
Eike Ziller
fbd8bbff47 German translation: Python, qmt, ScxmlEditor, TextEditor
Change-Id: I8f3561f69c0df09b01cef7c08e61b297d599076a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-05 06:10:18 +00:00
Eike Ziller
9804186523 German translation: Update Bookmarks, CMake, Core, CppEditor
Change-Id: Ie866b45390e9e37e825ad339f8ca6688fd7c6f7e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 06:10:04 +00:00
Eike Ziller
4e9b45dc5b German translation: LanguageClient, ModelEditor, Perforce, PerfProfiler
Change-Id: I0ae68cc3f2dff8044023d5a70d3b45f93543bc6b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-05 06:09:56 +00:00
Eike Ziller
a841add9bf German translation: Debugger, FakeVim, Fossil, Git, Help
Change-Id: I77bd7d5e38510e60bf34087b32418ea9f47411f4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-05 06:09:49 +00:00
David Schulz
f6fb693b38 Utils: fix emitting FancyLineEdit::validChanged after delayed validation
Change-Id: I0688f21020517ccf45011f8e0b1a5aeb8b1b4f2c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-05 05:11:01 +00:00
Cristian Adam
ce3530033d Vcpkg: Detect vcpkg root from path
Change-Id: Ieff796b228fba9cb5bddc6a012da0eacb1bfa43f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-04 21:50:04 +00:00
Tim Jenssen
d9910058a3 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
2023-07-04 20:36:03 +02:00
Tim Jenssen
7fada70e8f unittest: fix linking problem on windows
Task-number: QDS-10245
Change-Id: Ie6baee6c9e5c8351fe67b2dd49ad4e80147ec48a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-04 16:49:43 +00:00
Cristian Adam
09a0c0ec15 Auto-setup: Forward CMAKE_<LANG>_STANDARD to conan/vcpkg
Fixes: QTCREATORBUG-29292
Change-Id: Iee0b0639841d11fa14dcb57c1a4f9b4678aa0e2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
v11.0.0-rc1
2023-07-04 16:46:49 +00:00
Tim Jenssen
48230d63b8 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
 src/plugins/qmldesigner/CMakeLists.txt
 src/plugins/qmldesignerbase/CMakeLists.txt
 src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
2023-07-04 16:22:32 +00:00
hjk
ae7e72cca5 RemoteLinux: More direct aspect use in CustomCommandDeployStep
Change-Id: I5c5d993e97396bfa2bf52e6c2a01801703071929
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 13:46:14 +00:00
hjk
e53bc1630a AutoTools: Use direct aspect registration in AutoreconfStep
Task-number: QTCREATORBUG-29168
Change-Id: I886e84a752031cabb8bf235dc4e83c8f78ae88cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 13:22:07 +00:00
hjk
941c99c893 Boot2Qt: Use direct aspect registration in QdbMakeDefaultAppStep
Task-number: QTCREATORBUG-29168
Change-Id: I06c28f864cc9a517cfb8183ef2dfa366310438df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 13:21:24 +00:00
hjk
d0d1e1af1f A few more direct FilePathAspect value accesses
Task-number: QTCREATORBUG-29167
Change-Id: I8eba582303c16dddbdb5cea5bce43f048bac06b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 13:08:00 +00:00
hjk
2cc4967451 ProjectExplorer: Replace unusual ExecutableAspect constructor
... by an (only) slightly less weird setter.

Helps with a more uniform aspect API.

Task-number: QTCREATORBUG-29168
Change-Id: I40d2e878987ed7b817e08d250566bc548712749d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-04 12:49:01 +00:00