Commit Graph

74059 Commits

Author SHA1 Message Date
Thomas Hartmann
0d812cd59b QmlDesigner: Update wizard templates
These are the latest changes from qtquickdesigner/6.0 branch.
Since 7.0 these templates are now part of qt-creator.

Change-Id: I533c005734518eaf7dcd94f3f94167d973af68a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-04 09:29:40 +00:00
hjk
9ff851a204 Docker/RL: Be more lazy with output decoding
Conversion to QString is often not needed.

Change-Id: I22fe0ec89419f784d2fe02245094fbe6da719f75
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-04 08:35:48 +00:00
hjk
7c128638ea Docker/Linux: Fix outputForRunInShell
... in case there is embedded NUL in the output.

Change-Id: Ic899bcf8d01cceed4ea6e16d4991fb80b7ac70ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-04 08:35:21 +00:00
hjk
9007c12a5e TextEditor: Initialize TextStyles::mainStyle
Avoids some valgrind warnings.

Change-Id: Ib93af9655149e79829b6477469554368f54e0d08
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-04 05:28:37 +00:00
Eike Ziller
ac41f83232 Core: Split branded logo from other resources
We only need the special resource generation for the logo. Keep the
other resources shared with Qbs, so issues like QTCREATORBUG-26969 don't
happen.

Change-Id: Ibe418dffba19e342d0aa5ff30c34409cee184fc0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-03 22:57:55 +00:00
Robert Löhning
b8b5687f21 Squish: Fix availableTargetClasses()
Amends 40caa8a4ba.

Change-Id: Ib48a70fa641c5d3c65f53aad2dd1ce8fd3abce54
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-03 17:49:44 +00:00
Christian Stenger
4e716c0db5 Squish: Fix unknown global variable
Amends 40caa8a4ba.

Change-Id: I014210c2035fa0a69ca273718df726a523a23786
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-03 17:49:35 +00:00
Cristian Adam
8d12fd07e2 CMakePM: Rename "Additional CMake parameters" to "... options"
CMake documentation calls them Options, and we should use the same
terminology.

See https://cmake.org/cmake/help/v3.22/manual/cmake.1.html?#options

Change-Id: Ibb8ed9dd5a830290770a7fa89e7e5e1ce2d8c74a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-03 17:46:20 +00:00
Cristian Adam
633a9a04e2 CMakePM: Add "Kit Configuration" button in Settings page
This "Kit Configuration" button opens a dialog with the kit's
CMake settings.

This way a user can change all CMake related settings in the
project's Settings page.

Change-Id: I76b6e69ea7a9b96823f6583aef007cf413410407
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-03 17:18:30 +00:00
Christian Kandeler
b243a8d728 Wizards: Modernize qbs project templates
Change-Id: Ib6f6315f9730425d4fd3b566f66ed26aa1718695
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 15:40:33 +00:00
Eike Ziller
9bc9fb5a0d Fix avdmanageroutputparser test
- There is no PLUGIN_DEPENDS for tests, and it wouldn't work anyhow
  because of duplicated symbols. It was interpreted as a dependency and
  the test disabled because no such target exists.
- Move the platformNameToApiLevel(...) function to
  avdmanageroutputparser.h to break the dependency to a lot of Android
  support code.

Amends 78da7e2922

Change-Id: I6933684a76e5291d415c72388caa3df2bee7cbfb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-03 15:31:13 +00:00
hjk
1e34d6ee22 Debugger: Fix autodetection
Fixes: QTCREATORBUG-26978
Change-Id: I32585251d47729f7fde9ee6e707d9e9cfed4c1a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 14:38:43 +00:00
Christian Kandeler
92156cc1d6 LanguageClient: Indent code coming from the server
... if the client implementation requests it.
The server is not necessarily aware of our indentation style, so we
might have to apply it to the newly inserted code.

Change-Id: I43518575c7124568da42be3b04a28d7f352f6dc2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-03 14:30:19 +00:00
Jarek Kobus
f5b946abbe LinuxDevice: Implement runProcess()
Change-Id: I5300d36119ffb9fdd82a2ba7e02f76edc0fe2eda
Reviewed-by: hjk <hjk@qt.io>
2022-02-03 14:20:18 +00:00
Christian Stenger
9a5cb5896e Tests: Fix cmake file
Change-Id: Iebe454bee2037c0d150d5ea537419044745abc10
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-02-03 14:13:39 +00:00
Christian Stenger
eb2fc79a3f Docker: Fix handling of ui applications on macOS
Using graphical applications inside a docker image needs
the same handling on macOS as on Windows.

Change-Id: Ic9fb6a8330164f7acdaab4146a70e7e308192f4e
Reviewed-by: hjk <hjk@qt.io>
2022-02-03 14:13:22 +00:00
hjk
748cc38c26 BareMetal: Allow stlink_version to stay unspecified
Fixes: QTCREATORBUG-26928
Change-Id: Ia6dedb62c1e41472e176d8d247c7967fe5a430ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 13:42:03 +00:00
Thomas Hartmann
ca5d52dcd6 QmlDesigner: Update studioplugin.metainfo
These are the last updates from qtquickdesigner/6.0.

Change-Id: I81302a42f4dfb3da6379eea0e5d2a3f09a2c9e7e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 11:30:19 +00:00
hjk
5af00873cf FakeVim: Support backslashes in substitute command patterns
Change-Id: Ibfcea7fdc550082e4975e1fc4d2fba6563dbfd02
Done-by: Jochen Baier
Fixes: QTCREATORBUG-26955
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 11:25:12 +00:00
Christian Kandeler
2f925e2098 qbs build: Update minimum qbs version
Change-Id: If734b0051b98c8d3963afa54ad66b9b990db2a88
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 11:16:55 +00:00
Mahmoud Badri
10fe71546c QmlDesigner: Implement renaming assets folders
Fixes: QDS-6123
Change-Id: I1923f78fe2a6739f1cf32fd86c0919965190d8ca
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 10:58:29 +00:00
Mats Honkamaa
4e10170ccd Update loginui examples folder names
Folder names need to start with capital letter.

Task-number: QDS-6160
Change-Id: I5a77e693f9bfe0d85775a7b1e71ad9d0081025a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-03 10:40:05 +00:00
Jarek Kobus
239688180d Fix running as root
There is no need for TerminalRunner::setRunAsRoot()
as debugger is already being run as root.
Implement runAsRoot for non-terminal QtcProcess, too.

Fixes: QTCREATORBUG-26964
Change-Id: Id5110db86b7b809a5608714464241cee73875f2b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-02-03 10:23:25 +00:00
hjk
9b7f580a14 WebAssembly: Move auto-detection into stand-alone function
Change-Id: I641946e62998371e6e45b6c6d75e069b8729eaa6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-03 10:16:06 +00:00
hjk
2be0fc2537 ProjectExplorer: Use CommandLine instead of Runnable
Lighter and sufficient for all use cases.

Change-Id: Ic6749a1a9e3e6906ce71b87b237cc94a6d8a4cbf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-03 10:15:44 +00:00
Christian Stenger
b822b3f9e2 Tests: Provide qbs files for some manual tests
Change-Id: I6c5c839dc199379edaf4c43ae4d6a0ed6ebdf751
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-03 05:27:56 +00:00
Christian Stenger
841bd52e07 PluginView: Fix crash
Without a running QC we still need to initialize the
plugin manager properly.

Change-Id: Ia2a83080f68de9f88d214f5afbcb6a07f31daea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-03 05:27:44 +00:00
Cristian Adam
bc160ebe63 CMakePM: Revert selectedRows back to selectedItems
As it turns out changing to selectedRows resulted in having
the keys copied twice to clipboard.

The change would require some code adaptation.

Amends 0020ef7e30

Change-Id: Ie1decd154f7d22825f4d4eecd0bf544ecac7aa26
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-02 21:21:26 +00:00
Alessandro Portale
ccafc11fa6 Utils: Remove unused theme role TextColorHighlight
TextColorHighlight is a harsh "egineer red" #ff0000 in all themes except
one, where it is grey. Actually, TextColorHighlight was used in one
place, which now instead uses TextColorError.

Change-Id: Idcd61637edaa045fc718cf35a9d34ff1d5a64dad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-02-02 21:19:03 +00:00
Cristian Adam
0020ef7e30 CMakePM: Settings list UI changes
The CMake parameters QTreeView has now:
- alternating row colors
- row selection

Both key and value get the same font and foreground stylings.
- bold when the key is new or the value has been changed by user
- italic when the key has been inherited from kit or initial config
- red when there are differences between the inherited value and
  the current value

Change-Id: If09bb2c3e25f59938c5f56e6dd0d6817dfe442cc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-02 20:20:00 +00:00
Leena Miettinen
a3ca2f4c31 Doc: Describe new search options
In incremental search, you can now Select All occurrences of
a search term and open Advanced search.

Task-number: QTCREATORBUG-26610
Change-Id: I264f9c7ae7f73aab0ef63e5b70914ff6cdb2f02c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-02 15:38:37 +00:00
Mats Honkamaa
28a295b005 Doc: Update create project docs
Add information about the Recent tab in the create project wizard.

Task-number: QDS-5967
Change-Id: If52f96635c04529706007094aa0dbcc98c5be240
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-02 14:03:58 +00:00
Christian Stenger
40caa8a4ba Squish: Make presence of Qt4 optional
It is hard to build Qt4 nowadays. Any machine set up
today won't be able to build it without hazzle.
So, make it optional inside the Squish tests to avoid
fails and fatals. Use a different available Qt instead.

Change-Id: I151d809f4fada8047a30940a183f913af2a1a691
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-02 11:09:12 +00:00
Christian Stenger
b864496238 Manual tests: Adapt to upstream changes
Change-Id: If7a3cfe94f96c64efbd43636ab0d054f9dbce32c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:44 +00:00
Christian Stenger
435a4e9dd4 Shootout: Fix compile with Qt6
...and fix location of build directories used by the test.

Change-Id: I483739e8dedb9a1915115ae9895490cb79de5c94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:35 +00:00
Christian Stenger
d9f1421841 Manual test: Silence deprecation warning of proparser test with Qt6
Change-Id: I89fcc27e9d8f87fc35f677eea09a50ae3226a3a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:22 +00:00
Eike Ziller
779c59a3e6 CMake build: Fix missing tool button icon
- for the branding feature CMake uses a different, generated qrc file
- move the Qt logo out of the Qt Creator logo files, it doesn't belong
  there

Amends 5eafa345ed

Fixes: QTCREATORBUG-26969
Change-Id: I6f3d87abd52810d42142073ac944e6553c38caf1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-02 10:57:46 +00:00
Alessandro Portale
8f288bd7e4 ProjectExplorer: Improve layout in TargetTripleWidget
This gives the triple lineedit a bit of stretch.

Change-Id: Ib1742bc39c64b797b86e1740650a177689657557
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:21:46 +00:00
Thomas Hartmann
87663b6866 QmlDesigner: Fix performance bottleneck in navigator
NavigatorTreeModel::filteredList is relativly slow and it is frequently
called by ::index and ::rowCount.
We introduce the cache and also improve appendForcedNodes
to avoid quadratic blow up by using a set.

Task-number: QDS-6110
Change-Id: I83b860158ad2cdc1c83a9e8a72b2d13781e91f86
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-02 09:52:06 +00:00
Eike Ziller
bd095d1ebe Merge remote-tracking branch 'origin/7.0'
Change-Id: Ic646cdb2a14e5a2638ff88a922067dcf378dde5b
2022-02-02 10:47:20 +01:00
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
2022-02-02 10:17:03 +01:00
Eike Ziller
1221552377 Require CMake 3.16 and remove workarounds
CMake 3.16 is available on the major Linux distributions nowadays,
so we can get rid of some workarounds.

Change-Id: I32500375748f33c3e40fbd7a08824d823f817a8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-02 08:55:31 +00:00
Eike Ziller
275dcc8f8a File System view: Select root folder when clicking outside item
If the shown items are not filling the whole view, there is some empty
space at the bottom. Select the current root directory when the user
click there.

This avoids funny behavior. Without that change
- select a file or subdirectory in a directory
- collapse the parent directory
- the selected file or subdirectory stays selected, but that is not
  visible
- right-click into the empty space at the bottom
- the context menu for the not-visibly selected item is shown
- this is especially weird when e.g. choosing "New Folder"

That is not an issue if the view fills the whole space, because then a
visible item is selected when clicking.

Change-Id: I0c65e091e659c20d7b384e96ecf69c36379ed936
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-02 08:54:39 +00:00
Eike Ziller
a4b3085acb Fix issues with "Select All" (search results)
- the shortcut Alt+Return conflicts with "Trigger Refactoring Action"
- display the shortcut in find toolbar button's tooltip
- no need to repeat the default shortcut (it's the same Command)

Change-Id: Ifd1e56ba091806901241bdca66c42a332574bc0c
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-02 08:54:21 +00:00
Mats Honkamaa
f95636a820 Doc: Update multilanguage database docs
Update reference docs and tutorial for the multilanguage database.

Task-number: QDS-5966
Change-Id: I1aa3fa2fa8009bb0240ec787edbdc1589e87d5f1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-02 08:08:55 +00:00
Christian Stenger
3a9ce46928 Simple test app: Fix location
The location had been correct with qmake, but
is wrong with qbs and cmake.

Change-Id: I967f6db60e084dbc98548d61bb6eddbac4f7be24
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:33:59 +00:00
Christian Stenger
c8b2e4fe1e Manual tests: Correct qtc_processlauncher location
Change-Id: Ia3c550ae5cd0f2a6c75ec6d4fba230edf2a0bec8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:33:38 +00:00
Christian Stenger
f6061d4f1a Manual test: Adapt to upstream change
Change-Id: I4bb8b323535eaeb456d3cfcedaef0e67970cfe4e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:29:55 +00:00
Christian Stenger
075ebb932e Modeltest: Fix shared files
Replace deprecated and removed enums.

Change-Id: I9c374fab7662f181be5fe613d39afff963318315
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:29:41 +00:00
Cristian Adam
9c8f46a173 CMakePM: Add "Appy Kit/Initial Configuration Value" context menu entry
Now the "Initial Configuration" and "Current Configuration" displays
in red the mismatches between kit / initial value and respectively
initial and current configuration values.

By having a "Apply Kit / Initial Configuration Value" context menu
entry the user can resolve the mismatches if needed.

Change-Id: I2e272821c3ba396cd8a6b7c81e1437cb3fd4bbad
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-01 20:27:41 +00:00