Commit Graph

88532 Commits

Author SHA1 Message Date
Marcus Tillmanns
e21b8e0c1d Utils: Add FilePath constructor for TempFileSaver
Change-Id: I15286be055bd69544e4283740bd0c3411573475c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-12 11:24:05 +00:00
Christian Kandeler
44fa834f2b Update qbs submodule to HEAD of 2.3 branch
Change-Id: I13b506ee25d9f3668a8f995a7ddc3a95752780eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-12 11:17:51 +00:00
Teea Poldsam
dccd828f1f Doc: Update keyboard shortcuts
Created separate page for QDS. Reviewed and updated shortcut list.

Fixes: QDS-9499
Change-Id: I27d7dac386570c81958b8af5da2987143162aab4
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-02-12 10:46:27 +00:00
Cristian Adam
87c67fc6d7 CMakePM: Only display CMake preset Kits in the project setup page
Fixes: QTCREATORBUG-29535
Change-Id: I87c16c24a8548efb4374af342947d342e19cc510
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-12 09:55:27 +00:00
Cristian Adam
c553d63a32 PE: Allow ProjectImporter to filter kits in TargetSetupPage
Amends b9f546cf1b

Change-Id: Icf64f3cd751480c9fe2ae740f47954a62c252cc4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-12 09:55:20 +00:00
hjk
354f50f258 CppEditor: Use a hidden friend to compare BaseEditorDocumentParser::Configuration
Posh, and avoids an upcoming warning with C++20:

/data/dev/creator/src/plugins/clangcodemodel/clangdclient.cpp:907:40: warning: C++20 says that these are ambiguous, even though the second is reversed:
In file included from /data/dev/creator/src/plugins/clangcodemodel/clangdclient.h:6,
                 from /data/dev/creator/src/plugins/clangcodemodel/clangdclient.cpp:4:
/data/dev/creator/src/plugins/cppeditor/baseeditordocumentparser.h:37:14: note: candidate 1: 'bool CppEditor::BaseEditorDocumentParser::Configuration::operator==(const CppEditor::BaseEditorDocumentParser::Configuration&)'
/data/dev/creator/src/plugins/cppeditor/baseeditordocumentparser.h:37:14: note: candidate 2: 'bool CppEditor::BaseEditorDocumentParser::Configuration::operator==(const CppEditor::BaseEditorDocumentParser::Configuration&)' (reversed)
/data/dev/creator/src/plugins/cppeditor/baseeditordocumentparser.h:37:14: note: try making the operator a 'const' member function

Change-Id: I98ed9d907b673b9353f540bab2ff7239e018b4f2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-12 09:51:06 +00:00
Christian Kandeler
4d9fe5572d Fix qbs build
Include MsvcToolchain unconditionally, as in the CMake build.

Change-Id: I01c9642ee74bb8f4476ba318512f4f441a823b93
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-12 09:31:21 +00:00
Leena Miettinen
439773252b Doc: Add Known Issues to \ingroup creator-reference
It somehow fell out from there.

Point to the Change Log command for viewing the changes.

Task-number: QTCREATORBUG-29361
Change-Id: I59bc227e507495684f9d2cc9db19510481076d38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-12 08:51:16 +00:00
Artem Sokolovskii
6db8067821 ClangFormat: Fix warning readability message on dark theme
Fixes: QTCREATORBUG-30339
Change-Id: I57291907656b379468a066a09e767b886f17d7a0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-12 08:46:26 +00:00
Christian Stenger
46fd19591f Squish: Fix missing impl for deleting shared scripts
The action has been present for some time, but so far it had been
unimplemented

Change-Id: I798a144116ffeba60fb368430b30705ffc9b3f1c
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-12 08:42:25 +00:00
Eike Ziller
7a055a2f0a OutputWindow: Add "Save Contents" to context menu
And give individual output windows the option to set a default file name.

Change-Id: If3090063055c1b37f4f2d63b971fe0476f11806e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
2024-02-12 07:44:19 +00:00
Christian Stenger
35b7f868f5 SquishTests: Remove firewall handling for Windows
Handling the firewall from script is cumbersome and not worth the
effort - remove all related code.
Explicitly state the prerequisite of disabling notifications for the
firewall.

Change-Id: Icbe3075127eeb9a57724c334f0b52a24f8b08f59
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
2024-02-12 05:53:14 +00:00
Christian Stenger
e1f6ee8f76 SquishTests: Do not wait for the BuildProgress
We always fail to retrieve it nowadays, so just remove this.

Change-Id: I616e40e22ed1da2782b766701ba4b5bd742e1133
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
2024-02-12 05:53:01 +00:00
Andre Hartmann
c22471d316 Git: Disable upstream status for Detached HEAD
It was always zero as Detached HEAD is a special
branch that is not actively queried. It can be
enabled later, but the quick fix is to disable it.

Change-Id: Ib191e1b5551a13bc4911184e12e06a0b4dc28ddf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-11 19:26:18 +00:00
Andre Hartmann
d9eeddfad1 Git: Fix upstream status for untracked branches
Using HEAD is wrong as soon as the branch is not
checked out. Instead the branch name must be used.

Amends 960ac1adf4

Change-Id: Id10b4012455ccb9b393404413a369f241edc098e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-02-11 11:27:58 +00:00
Ali Kianian
9fedced0ac QmlDesigner: Reset table cell sizes after resetting CollectionDetails
Fixes: QDS-11743
Change-Id: I7b8f0a83d796bd8094981e12032e6f0b465e2508
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-09 20:35:57 +00:00
Michael Weghorn
3b5c377ce5 Debugger: Fix custom allocator dumper tests for GCC >= 13
GCC commit [1]

    commit 64c986b49558a7c356b85bda85195216936c29a3
    Author: Jonathan Wakely <jwakely@redhat.com>
    Date:   Wed Dec 14 15:21:32 2022 +0000

        libstdc++: Diagnose broken allocator rebind members

added a static_assert that caused the dumper tests using custom
allocators to fail like this on Debian testing:

    DEBUG : tst_Dumpers::dumper(StdBasicString) qtc.debugger.dumpers: In file included from /usr/include/c++/13/ext/alloc_traits.h:34,
                     from /usr/include/c++/13/bits/basic_string.h:39,
                     from /usr/include/c++/13/string:54,
                     from main.cpp:28:
    /usr/include/c++/13/bits/alloc_traits.h: In instantiation of ‘struct std::__allocator_traits_base::__rebind<myallocator<char>, char, void>’:
    /usr/include/c++/13/bits/alloc_traits.h:94:11:   required by substitution of ‘template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = myallocator<char>; _Up = char]’
    /usr/include/c++/13/bits/alloc_traits.h:228:8:   required by substitution of ‘template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = char; _Alloc = myallocator<char>]’
    /usr/include/c++/13/ext/alloc_traits.h:126:65:   required from ‘struct __gnu_cxx::__alloc_traits<myallocator<char>, char>::rebind<char>’
    /usr/include/c++/13/bits/basic_string.h:90:24:   required from ‘class std::__cxx11::basic_string<char, std::char_traits<char>, myallocator<char> >’
    main.cpp:56:71:   required from here
    /usr/include/c++/13/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
       70 |                         _Tp>::value,
          |                               ^~~~~
    /usr/include/c++/13/bits/alloc_traits.h:70:31: note: ‘std::integral_constant<bool, false>::value’ evaluates to false
    make: *** [Makefile:506: main.o] Error 1

Override the rebind behavior of the custom allocator used
in the tests to fix this.

[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=64c986b49558a7

Change-Id: I1cd8370e5f1601b710e28c251061291c65ac44ce
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-09 19:50:26 +00:00
hjk
0b44cc5589 Vcs: Hide topic cache in new IVersionControl pimpl
Potentially more stable api long-term. Also simplifies the
user side code a bit.

Change-Id: I6913e27e2a5dc14907e72f252081cdbed34842a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-09 16:00:56 +00:00
Marcus Tillmanns
5a643b1c0a QtSupport: Mark remote Qt Versions
Adds a postfix " (on ...)" to the default name of qt versions
if they are located on a remote device.

Makes it easier to distinguish Qt Versions

Change-Id: I02208f49d5a1b6b22294b8cc29348455808f342f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-09 14:07:18 +00:00
Ali Kianian
97af12dcb8 QmlDesigner: Tweak the ui of the Model Editor
* A SplitView is used instead of GridLayout for the CollectionView
* The left margin for the model items are removed

Task-number: QDS-11732
Change-Id: Id66171788db1f17583147fc6f16ffd0e69ac56a5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-02-09 13:11:05 +00:00
Leena Miettinen
8869fefb72 Doc: Describe changes to ClangFormat preferences
Task-number: QTCREATORBUG-30209
Change-Id: Iff7587cca92c016f2f6ff5f40150d620f623a9b2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-02-09 13:02:42 +00:00
Ali Kianian
c584cf67ea QmlDesigner: Remove potentially excessive values from dataStore records
Change-Id: Ib2606fc50662b7724ae2ba11d21264334638bec9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-09 12:35:16 +00:00
Cristian Adam
0d40cc5093 CMakePM: Fix conan generators path using backslashes
This can cause issues with CMake, since CMake uses slashes as directory
separator.

Fixes: QTCREATORBUG-30326
Change-Id: I0c03b3bcd32bddc99fb361eb8e6aaffd0b1f10b6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-09 10:41:59 +00:00
hjk
4e5692d628 Vcs: Use QString and Id in editor parameters instead of char *
... and use it to simplify the translation setup.

Change-Id: Ibd386ede3ecfc351316bed53bc184954adbcaa74
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-09 10:27:01 +00:00
Marcus Tillmanns
a020c13e10 Filepath: Fix operator<()
Previously a QMap with FilePath as key would return wrong
entries when comparing paths with and without scheme/host.

Change-Id: Icc5d119a18c1b7a2fdab9c89f162c48859926523
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-09 10:21:11 +00:00
Christian Stenger
f18dcf2202 TextEditor: Fix capitalization
Change-Id: I220426e01c97eceab607e3b5c31bd8e294f48273
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-09 08:01:21 +00:00
David Schulz
971bcb1a5a TextEditor: fix multi text cursor unindent via backspace
Change-Id: Iec2e9251b977ccbd7433009ac3e706a9327c704c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-09 07:53:48 +00:00
Marcus Tillmanns
e073c54d01 Terminal: Fix opening terminals on remote devices
When the active project is on a remote device the working directory
is set to its root directory. In this case we need to find the right shell
binary from the remote device.

Change-Id: I6b541273d23a8de5442ac041b28d81984ed5ef65
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-09 07:40:59 +00:00
David Schulz
5328674479 TextEditor: simplify SyntaxHighlighterRunner interface
Change-Id: I6c8d51d8dccc91514c89267eac2cea66c87a871a
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-02-09 03:37:22 +00:00
Cristian Adam
7454f84901 CMakePM: When using presets only use presets for candidates
Since the CMake presets is built upon Imports, when loading the presets
it's better to only use the candidates from preset Kits and not any
matching Kit that could handle the build directory.

This makes working with CMake Presets a bit easier.

Task-number: QTCREATORBUG-29535
Change-Id: I895e2e9162763e4cf3af5cdef5c9d5b228211fab
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-08 17:36:22 +00:00
Andre Hartmann
98acd22734 DiffEditor: Init some more members to nullptr
Change-Id: Ia08c0ce5d6641533fe08f0a500f7439ec79882d8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-02-08 17:35:34 +00:00
Miikka Heikkinen
99f5b8a0af EffectComposer: Clear deleted effect if it is currently open
Fixes: QDS-11787
Change-Id: Iecd177a153e88a49476dbea0241c31726d05a6a8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-08 15:12:54 +00:00
Miikka Heikkinen
c673e6aa20 QmlDesigner: Update extended View3D icons
Change-Id: If1aac862a3e62e518d321e61ddf3e7c25e30efb7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-08 14:57:48 +00:00
Johanna Vanhatapio
c6705be88b Doc: Describe the Effect Composer
Fixes: QDS-10528
Change-Id: I46d7ab1977acb7f0af5c0aa790de7fbf2624a449
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-08 14:38:11 +00:00
Miikka Heikkinen
b1362ddda6 QmlDesigner: Do not register Effects for item library
Fixes: QDS-11925
Change-Id: I981853d1c02d99cfb391209a9a7e568bf52401cf
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-08 14:26:41 +00:00
Miikka Heikkinen
ca6e6e4f3e QmlDesigner: Fix validation on integer spinboxes
Now spinboxes use IntValidator if decimals is set to zero.

Fixes: QDS-11922
Change-Id: Ibe8c8a18294a6764a0cd2182d09c30cdf9fb27cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-08 14:26:29 +00:00
David Schulz
0422374e04 TextEditor: remove unused function of syntax highlighter
Change-Id: I9debd22730fcf2c9423beaaa5666ce282ed0bbe0
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-02-08 14:24:38 +00:00
David Schulz
e3bbace665 TextEditor: fix double delete in synchronous syntax highlighter
Change-Id: Ic4b9b78e5464613b9982814d771925d41f88bb25
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-02-08 14:24:31 +00:00
Artem Sokolovskii
cf7f9dffd5 Android: Fix Segfault when cancelling Android SDK installation
Fixes: QTCREATORBUG-30246
Change-Id: I929779e4cd8c37c9d69bd7aaffe9ae5b9acb7435
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-08 13:46:04 +00:00
David Schulz
1cddc3d0b6 TextEditor: fix applying empty list of format changes
The block might have had some highlighting before the update, so compare
the new ranges against the one from the layout and update the layout if
the format ranges differ.

Change-Id: Ia6a0025e74fa8941b1cccc00baa93d3d37cb9ff9
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2024-02-08 13:32:06 +00:00
Marcus Tillmanns
7b65432688 Wizard: Allow wizards to choose remote path
Change-Id: Ia7b0184452e2c4e86d727fbc3880b2e27285ef5d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-08 13:24:47 +00:00
Marcus Tillmanns
70e013fd25 Git: Cleanup gitExecutable()
Using expected removes a bunch of handling code.

Change-Id: Id524912d82aa693fbb39c7e7fa34abd77153f92e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-02-08 13:24:38 +00:00
Orgad Shaneh
31ca46ef2f VCS: Remove trailing dot in "running" message
The command should be copyable.

Change-Id: Id44e8af81f32de3d9899293de504070011f896c2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2024-02-08 12:36:39 +00:00
Robert Löhning
b163044648 SquishTests: Update expected output in tst_git_clone
Change-Id: Ia0a559ee8fb24d639b913dabc1b77dd4c2286fbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-08 12:31:51 +00:00
Jarek Kobus
ba9ecc9b85 CppEditorOutline: Remove unused method
Remove also unused include and forward declaration.

Change-Id: I67d9ea45bc1073653b17faa3433f132a5e43f924
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-08 10:07:20 +00:00
Jarek Kobus
6deddd15c0 ModelManagerSupport: Remove unused Ptr
Change-Id: Ibdc81d1c6fecb808cbd7ca91f56a4869b6e26dc1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-08 10:07:11 +00:00
Christian Kandeler
228f77afd1 QbsProjectManager: Support completion via qbs' LSP server
Task-number: QBS-395
Change-Id: I2571dc46c9fb2867daeb3a5d00709337b12a750b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-08 09:52:58 +00:00
Miikka Heikkinen
c491d652ab QmlDesigner: Prioritize hiding asset_imports content in UrlChooser
If the same file is available under asset_imports and outside it,
prefer hiding the copy under asset_imports in UrlChooser when duplicate
hiding is enabled.

Fixes: QDS-11908
Change-Id: I06ac298e1ea45f6a94c66eb20cc4c0d4655103f4
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-02-08 08:58:36 +00:00
David Schulz
eb95794e67 Debugger: Fix std string view dumper test for msvc
Cdb always report the type name with all typedefs resolved so we have to
check the original type name for cdb.

Change-Id: Ib7166276075b18e011ea786a5d3468db0e24e9c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-08 08:46:36 +00:00
Dominik Holland
ecc3879cf4 AppMan: Only allow Debugging/Profiling with a Linux kit
Change-Id: I196fe6cc85065c3d9965f5fbb342f377bd221d95
Reviewed-by: hjk <hjk@qt.io>
2024-02-07 15:52:22 +00:00