Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
d301ddabc7 Subversion: Follow the Fossil settings setup
Change-Id: I967396073abbcbc3058a016d5d37fa3fc5645f8a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 13:10:13 +00:00
hjk
f6c995cdd0 Bazaar: Follow the Fossil settings setup
Change-Id: If711f8a43a6579c72cad1bc98ef24c3fdd83993b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 13:09:58 +00:00
hjk
545a105634 Git: Also use the latest settings setup approach
Change-Id: I34a210575d02d18927c1e0f6d8ea6cb9924c563d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 13:09:47 +00:00
Marcus Tillmanns
c82d7ccdcd Utils: Delay close signal in pty process
The close signal of the conpty process needs to be delayed
as it otherwise might arrive before the last output of
the process.

This should be fixed in the future by using overlapped io
for the pipes.

Change-Id: I49fe4863672a0b14f5766bbe5ee7b1d8894594ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 12:12:20 +00:00
hjk
9dad4ab9d4 CMakeProjectManager: Rework CMakeFormatter
Use PagedSettings, make setup more local, remove Q_OBJECT

Change-Id: I9e91f9e63ed8ad15749323bd039d118562dba1a6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-15 11:21:45 +00:00
Jarek Kobus
72d9decb87 QEventLoop: Remove unused includes
Change-Id: Ic278aa9b204a3caa17e38125d07a0176a8281422
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-15 10:35:29 +00:00
Artem Sokolovskii
948dc6b37e ClangFormat: Fix clangformat ignores configuration file
Fixes: QTCREATORBUG-29145
Change-Id: I6950151aaab9df51cfdd0af0ad9cf3c7b35c0636
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-15 10:08:38 +00:00
Marcus Tillmanns
c158921af3 ProjectExplorer: Don't allow remote run in terminal
Currently the process stub does not support starting / debugging
processes on remote devices. To reflect this the "Run In Terminal"
aspect is disabled for remote targets.

Fixes: QTCREATORBUG-29058
Change-Id: I9b3bcd65d4db468c683f2743a49227bfbecaf3d3
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 10:05:54 +00:00
hjk
12f788179e Fossil: Make settings more directly accessible
I am still not sure how the final pattern may ideally look like
but it looks like some kind of singleton access to a plugin's
settings helps with clarity.

Change-Id: I6a6a5f5b7cfdfb062f5b5231a79086f34e09487f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 10:05:52 +00:00
hjk
ef4fa870fc Fossil: Make operator== fro RepositorySettings a hidden friend
Change-Id: I82091ddec03ea10ef0fbd5ec2767a8219a2a3a76
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 09:54:50 +00:00
hjk
e6d574ee77 Fossil: Consolidate optionpage/apply further
Change-Id: I345c6f38421864630d99a45fd2176ba0836536e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-15 09:54:44 +00:00
David Schulz
fe74e6d43b FakeVim: only block suggestion when fakevim is in use
This fixes the issue that no copilot suggestion were shown after
switching documents.

Change-Id: Ic81bfbe266877964eeaf688d9915a7937607118b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-15 09:28:40 +00:00
Christian Kandeler
63b2934a62 ProjectExplorer: Do not override application cursor in TaskView
Change-Id: Ia8c332ee4d736c74fd773ecc5aecf8ee1c8345df
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-15 09:16:04 +00:00
hjk
e71f9b9c87 Uitls: Make BaseAspect::isDirty() virtual
It's sometimes not so easy to trigger the volatileValue() != value()
branch, so create a way to be explicit when needed.

Change-Id: I322508a33c935077038d730fd09c819419901353
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-15 08:47:26 +00:00
Jarek Kobus
6b600798a4 LanguageClient: Remove the old matchesFor() implementation
Rename some workspace filter classes to conform to
the names for cpp filters.

Remove some unneeded intermediate classes now.

Change-Id: I1ec0dbb7ed91944e9dd8b1b0f4878b826191a020
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-15 08:00:30 +00:00
Jarek Kobus
4d2710bae2 UrlLocatorFilter: Remove the old matchesFor() implementation
Change-Id: I2d04f4bf66ec12c8c641cbfb39a4c2b0049ecdc4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-15 07:50:28 +00:00
Jarek Kobus
091f3f71f8 SpotlightLocatorFilter: Remove the old matchesFor() implementation
Change-Id: If1ecc94b4246a279c3688c7c8320ccbd18b3533c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-15 07:49:13 +00:00
Jarek Kobus
681627cac3 CurrentProjectFilter: Remove the old matchesFor() implementation
Change-Id: I2bd960c14056907e6735002120900b6252ea3989
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-15 07:46:53 +00:00
Christian Stenger
9c2fa5c975 Perforce: Fix testing settings
Changed settings had been taken into account only after
an explicit Apply and this may be rather confusing.

Change-Id: I344ddf18a3cb15b0bc2d2b41a38587395b592e46
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 04:52:55 +00:00
Christian Stenger
985c1ee3e9 Perforce: Do not wait for process if not set up
The process could be not set up correctly or at all if
we exit the start function early.
Avoids a soft assert.

Change-Id: I9f0d71acc4a440b85dbb26fa656e0b551ae685f4
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 04:52:19 +00:00
Orgad Shaneh
64d1f49078 Autotest: Fix struct/class misalignment
Amends 30af7a9503.

Change-Id: Ie8ca92c427fc3446727d78a76aee492eb789b7ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-15 04:50:18 +00:00
Björn Schäpers
7327a3bbc2 Registryaccess: Fix defined but not used warning
In file included from .../src/plugins/debugger/registerpostmortemaction.cpp:6:
.../src/shared/registryaccess/registryaccess.h:26:21: warning: 'RegistryAccess::autoRegistryValueNameC' defined but not used [-Wunused-variable]
   26 | static const WCHAR *autoRegistryValueNameC = L"Auto";

I don't think using static in a header is a nice thing, inline would
work, but we have constexpr which implies inline.

Change-Id: I7b872e65a554a9a9feb39845717c5dba7ba6777c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 19:45:44 +00:00
hjk
ab8f3d78ae Utils: Use QAbstractButton instead of QCheckBox in BoolAspect
Opens the path to use e.g. QRadioButton.

Change-Id: Idb1591c0a1486181b8aeb51edb93bc4bfecef834
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 16:17:49 +00:00
hjk
c85b72000f All: Use the shorter access to aspect values in a few places
Change-Id: Ie0ff0e4e1cf4c2750897ea733dfccb743f44fa93
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 16:04:38 +00:00
hjk
30af7a9503 AutoTests: Aspectify parts of main settings
Change-Id: I407b5102e1f2a6647f6fdca01a61dfa422c5d3ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:54:24 +00:00
hjk
4c1a161abd Utils: Fix some IntegerAspect value display issue
... when a display scale factor was set.

Change-Id: I764db99e444f9cc70871c3dbec101d0b65542c4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:54:01 +00:00
Jarek Kobus
2b54ef80d1 LocatorFilters: Use ILocatorFilter::createRegExp() consistently
Use it consistently inside ILocatorFilter subclasses, instead
of FuzzyMatcher.
Drop repeated default arguments from the caller.

Change-Id: I53762f27216a30ed0281f3d0ddc5e50c7452559a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 14:32:49 +00:00
hjk
5cf5b1ae3f Utils: Add an AspectContainer::changed() signal
In contrast to applied() only emitted if anything was dirty before.

Ideally, applied() would not be needed, but I am not sure about
downstream uses.

Change-Id: Ie0c293b8730c503fc4409884a33207ee9ca5f129
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 14:29:11 +00:00
hjk
ddee1c92a4 Utils: Add operator() as a way to access .value() for some aspects
This can make the user code look a bit nicer.

Change-Id: I98867114810ede2f04342144f600682ff3c261b4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:28:18 +00:00
hjk
cfbdee3a3b Beautifier: Base AbstractSettings on Utils::AspectContainer
Plan is to eliminate AbstractSettings as much as possible and
use Aspect functionality instead.

Change-Id: Idb71fb4df0893ffa4713b0182c21725f0c71089e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 13:50:53 +00:00
hjk
7dd27301ab Beautifier: Base Beautifier::GeneralSettings on Core::PagedSettings
This also uses the "Enable auto format on file save" bool directly
for the now-checked group box.

Change-Id: I7f3f392828f6ccfda99fa1d757f49cb9e3b6bc1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 13:12:10 +00:00
Jarek Kobus
0672314844 DirectoryFilter: Remove the old matchesFor() implementation
Change-Id: Iae8a2e3adda7fdaec69873bf4b171da98eee4874
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 13:11:25 +00:00
Cristian Adam
0dbc208a07 CMake: Add -fPIC also for OBJECT libraries
add_qtc_library would have set the POSITION_INDEPENDENT_CODE property
for STATIC libraries on UNIX based systems.

The OBJECT libraries need the same treatment.

Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 12:49:05 +00:00
Thomas Hartmann
c7a4ebcfcb QmlDesigner: Use simplifiedTypeName also for m_backendValueTypeName
In some cases the type has a QML prefix.

Task-number: QDS-9880
Change-Id: I3752970a6e2006dc8813976bf50a94bf375741fd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-12 12:48:40 +00:00
Cristian Adam
62e9a0bec1 CMakePM: Stretch the CMake parameters column on resize
Makes sure that the CMake parameters columns are properly stretched when
Qt Creator window is being resized or maximized / restored from
maximized state.

Fixes: QTCREATORBUG-27257
Change-Id: Ifb4d439fb758dcc5b2593be917ba35e9c79f2840
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 12:07:31 +00:00
hjk
fc8ae0e2dc VcsBase: Remove unused settings member
Change-Id: I3247a639d9607a4acbf5477302e1f2860325a0e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-12 11:59:56 +00:00
Marcus Tillmanns
69fbe72752 Utils: Use FilePath hash in operator==
Change-Id: Ibbea420a5a5353da221d285b70272cdf9b09d0d0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-12 11:47:08 +00:00
Marcus Tillmanns
6149fd8bfa Utils: Cache FilePath::qHash
Calling toCaseFolded is expensive if the same filepath is hashed
often, so we calculate the hash value once and cache the result.

One such case was found to happen when parsing tests,
as the cpp parser is queried a lot and it uses hash maps / sets
with filepaths.

Change-Id: Ic3ca7f09e8f108f5a89b3fdb17743ae7c3258001
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 11:34:18 +00:00
hjk
ed6f5e3486 Layouting: Add a plain 'Widget' item
Change-Id: Id419b1efd56f51fb282b11c4b241b96eb7d7d0ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 11:21:15 +00:00
David Schulz
1a98dda5c4 Utils: fix Text::Range length and remove mid
Those functions are based on the assumption that the passed text starts
at the begin position, which was good enough for search results, but if
used in other parts of the codebase it might give unwanted results.
Calculate the length of the range now as expected and subtract the
beginning lines.
In order to still got the correct results for the text result texts
modify the result range to always start at the first line before
calculating the length of the range.
Also add tests for the modified functionality

Change-Id: I7ccd75b642dda6dd4f738877cbe3543d46c03652
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-12 11:03:33 +00:00
The Qt Project
70609cdec6 Merge "Merge remote-tracking branch 'origin/10.0'" 2023-05-12 10:42:27 +00:00
Miikka Heikkinen
392e9cc84c QmlDesigner: Fix compile error
Change-Id: I6694cd0d48eb00d64be93019d4af418e64ad23a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-12 10:33:17 +00:00
Tim Jenssen
95d424bc3d Revert "qds: workaround that appbundle finds the images"
This reverts commit f3fcce9f4f.

Reason for revert: produces other problems

Change-Id: I2225ffc96d30a9dc175a977602f7c8378b5cb31c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-12 10:25:48 +00:00
Eike Ziller
51df19270b Merge remote-tracking branch 'origin/10.0'
Change-Id: I7cfdfc13097d5037fea597ecba98ae902a0c5afb
2023-05-12 12:24:39 +02:00
Cristian Adam
dc18d4b9ee CMakePM: Display presets as part of the project outline
Fixes: QTCREATORBUG-28966
Change-Id: Iae0f77956bf6f4682ea8a25e08d05de3331c7420
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 10:21:53 +00:00
Marcus Tillmanns
aca8e5906b AutoTest: Output time taken when parsing tests
Makes debugging easier as you don't have to calculate
end - start yourself.

Change-Id: Ib75a36bbf52633e188a6c4bbd488eb439cb52984
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 10:17:05 +00:00
Henning Gruendl
94b019dbe0 QmlDesigner: Add duplicate control
Add a setting/property to the EditableListView in order to control if
it allows duplicates or not. If duplicates are not allowed it will
disable the items in the ComboBox which are already applied to the
assigned backend property.

Task-number: QDS-6730
Change-Id: I31776fdfb14858c431b40d264e8e709009c517b3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 10:14:43 +00:00
Marcus Tillmanns
161cac0a85 Terminal: Fix Shellintegration for bash
bash needs long options to be before short options.

Change-Id: I277a9283253f11bcb76e0366a0b6c5a0346fdfd8
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 09:35:43 +00:00
Jarek Kobus
3e3a202e75 OpenDocumentsFilter: Remove the old matchesFor() implementation
Change-Id: I1166dbd17125aa3c6bab4dae4c416063c4b6f7ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 08:59:27 +00:00
Miikka Heikkinen
8188bd2b3a QmlDesigner: Fix crash callback for lights baking
NodeInstanceView sets the crash callback to connection manager,
which overrode our initial setting. Crash callback must be set to
NodeInstanceView instead to work.

Fixes: QDS-9869
Change-Id: Id0f5e5cfbdaa978314ff8f8a72f30df7c0a98b61
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-12 08:19:34 +00:00