Commit Graph

68568 Commits

Author SHA1 Message Date
hjk
7eb9d8cb60 ProjectExplorer: Introduce a KitAspect::createManageButton() function
Saves some repetition downstream.

Change-Id: Ied58586572d3e70669c9172c5076bbd12e211aa7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 12:05:35 +00:00
hjk
77481f25ce ProjectExplorer: Base KitAspectWidget on BaseAspect
Enables re-using existing functionality.

The "Make mutable" functionality is still oddly placed. I doubt people
find and use it actively.

Change-Id: Ic6aae17e3a7df093f0f5f234f1e6e1afc196a087
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 12:02:19 +00:00
Eike Ziller
332e71255e COIN build: Use sccache
Unfortunately we have to turn off separate debug info for this,
because sccache is not compatible with /Zi on Windows.

Change-Id: I5e9e3bb298bd4f72a79e944485523a553349590b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-19 11:29:31 +00:00
Leena Miettinen
dfadc17cb5 Doc: Describe Sort Alphabetically option in Outline view
And add screenshots for all sidebar views.

Task-number: QTCREATORBUG-25162
Change-Id: I7890d57adf04517c534a9b36de89170039f3de93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-19 11:04:09 +00:00
David Schulz
2727016f1d DiffEditor: Use unique action group id
Change-Id: I36e381518250b00cc8cbd9ac8630b2aa5c2fc631
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-19 10:56:18 +00:00
Jarek Kobus
7beee7fa99 StringTable: Ensure only one GC() thread is running at a time
The possible issue with the current implementation is that
in theory many possible GC() are being executed in parallel.
In this case just one of them is really working and others
are waiting on the locked mutex (first line of the GC()
method). In such a scenario when a call
to StringTablePrivate::insert() is being executed from one
more thread, it may happen that the working GC() thread
is stopped (since m_stopGCRequested.fetchAndStoreAcquire(true)
was executed from insert()) and later the mutex lock may be
granted to the other awaiting GC() thread instead to the
thread which executes insert() method. In this unlikely
scenario the GC() thread won't be canceled and the lock
inside the insert() method may be locked for considerable
amount of time, what is not desired.

The goal of this patch is to resolve the possible issue above
and to simplify the code by eliminating the m_stopGCRequested
variable and make use of QFuture.cancel() / QFuture.isCanceled()
API instead. In addition, since we control now only one
possible thread that executes the GC(), there is no need for
future synchonizer anymore.

GC() function can't be run in parallel in different threads,
as the whole body of GC() is protected with mutex. This means
that whenever a new scheduled call to GC() is being executed,
this new call waits on the mentioned mutex at the beginning of GC().

So, instead of protecting the whole body of GC() with a mutex,
we ensure that the old call to GC() is already finished (if not,
we also cancel the old call) while preparing an asynchronous
call to start a new GC() from inside startGC() method.

Whenever we are calling the insert() method, we still protect the access
to m_strings with a mutex (as insert() is designed to be called
from different threads in parallel). Just after locking the mutex
we are canceling any possible ongoing call to GC(). After canceling
the GC() call, we are sure that no new call to GC() will be executed
until we unlock the mutex, so it's safe now to modify the m_string
data.

Change-Id: If72d0a6f98fb414c6c63117bc9baa667d17e1ffe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 10:24:30 +00:00
hjk
2a1742b289 AutoTest: Use LayoutBuilder for GTestSettingsPage
Change-Id: I7449732a77e1cb2635df3bb45c7ebb24955209d2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-19 09:45:26 +00:00
Leena Miettinen
0152e33af9 Doc: Add image to Cluster Tutorial example docs
Fixes: QDS-4188
Change-Id: If9ac5b7e73221e43d643888e3ecf309c01279a8d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-19 09:39:32 +00:00
hjk
7769d881bc RemoteLinux: Fix regression in X11 Forwarding aspect display
Probably introduced during the base setLabelText consolitation.

Change-Id: Idb874f1fad32cb2871d43249e9ce6e17f6cc4c1e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 09:38:01 +00:00
Andre Hartmann
2df71c5798 Lexer: Support the integer suffixes LU and LLU also
Before we only supported UL and ULL.

And add tests for all variants of allowed integer suffixes.

Fixes: QTCREATORBUG-25604
Change-Id: Id92f371d2effa7456d2d50891a6c29810c5c4c75
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 09:16:55 +00:00
Leena Miettinen
2ae36b9e26 Doc: Describe quick fix options
Fixes: QTCREATORBUG-25581
Change-Id: If1e2434f36c71ebc2ff484f3f4c2c94cdd362c98
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 09:08:56 +00:00
Andre Hartmann
e31af51958 Environment: Wrap path lists at separator for tooltips
Therefore move the list detection code to the model.

Reason: The HTML wrapping mechanism used before
created hard to read tooltips like:

  /opt/Qt/5.15.2/gcc_64/bin:/
  usr/bin:/home/user/bin:/
  usr/local/sbin:/usr/local/
  bin:/usr/sbin:/usr/bin:/sbin:/
  bin:/usr/games:/usr/local/
  games:/snap/bin

which changes to the list below now:

  /opt/Qt/5.15.2/gcc_64/bin
  /usr/bin
  /home/user/bin
  /usr/local/sbin
  /usr/local/bin
  ...

Task-number: QTCREATORBUG-7993
Change-Id: I08acc2cad0d12cb4309ee50d837c50dc9ccba2d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 08:57:41 +00:00
hjk
6ceb2244d8 Qnx: Use new RunConfiguration::setRunnableModifier
Simplifies code.

Change-Id: I8d1e2e93ae1142b40fef0158de3301aead54fc7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 08:53:09 +00:00
hjk
e03af19edc RemoteLinux: Use new Run:setRunnableModifier
Change-Id: If5f509530f187dde6c6f5f8dc8b03ec8ab16bbfc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 08:53:00 +00:00
Christian Kandeler
f307c55eac ClangBackEnd: Fix mis-detection of operator<
Inside the body of a function template, clang reports a different cursor
type for operators in some cases. Make sure we don't mistake such
operator< or operator> as opening or closing a template, respectively.

Fixes: QTCREATORBUG-25596
Change-Id: Ifc357e199ea13e44ac501613639e667c333d48e3
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-19 07:51:24 +00:00
Christian Stenger
4d63206d95 Utils: Add helper methods for SelectionAspect
Change-Id: Idda6ac0846549f37e934d3e856c453ed314c7880
Reviewed-by: hjk <hjk@qt.io>
2021-04-19 06:20:03 +00:00
hjk
4059c27d7a ProjectExplorer: Use manual loop in RunControl::canRun() implementation
I find the std::bind version much harder to debug.

Change-Id: I0badb4c29097a5432b110a815cb2206477091d98
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-19 05:09:04 +00:00
Jochen Becher
05324cf21f Extend Utils::FilePath for relative paths
The new methods allows converting a path to a file or directory into a
path relative to another path to a file or directory.

Change-Id: I8c743d5bced9fec81b05ce94ac2b7bec307d9028
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-19 04:55:54 +00:00
Vikas Pachdha
ee3e4f9e25 AssetExport: Export custom id
Task-number: QDS-4114
Change-Id: I013ff674f0e9f59ed0a82803114faffae28bd74a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-18 22:24:21 +00:00
Andre Hartmann
3d4b5c0269 VCS: Fix second line commit message verification
For commit messages consisting of only two lines, no
warning was shown when the second line was not empty.

Now a warning is print for:

 First
 Second
 Third

as well as:

 First
 Second

Change-Id: Ibf19bc46465446f1634f9fdc783bd194b837d5ec
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-17 17:41:33 +00:00
Henning Gruendl
e6c28a7844 QmlDesigner: Fix ProjectsGrid delegate MouseArea
Task-number: QDS-4193
Change-Id: I68897288a75f864f5d361c41b52cf6e888f91bce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-16 14:54:43 +00:00
Tim Jenssen
1f2b0cbf39 qmlpreview: fix crash
Change-Id: Id1b9d8c070539e8935e2d7492f6a8c2567739e00
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-16 14:48:49 +00:00
Tim Jenssen
a8cf61b745 qmlpreview: fix PUBLIC_DEPENDS
Change-Id: Ifaf579c63eea8c41293cc6ddddd811b065376467
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-16 14:30:12 +00:00
Vikas Pachdha
5a79e08fd6 Docs: Update the Qt-Bridge plugin docs with new terminology
Task-number: QDS-4125
Change-Id: I99ecc21f0631ed57f1891754f672bdb0b1feec0c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 13:17:58 +00:00
Vikas Pachdha
eb8f282d44 Docs: Update import behavior when QML Type is defined
Task-number: QDS-4125
Change-Id: I38c2fcec2931995541c9de78231fc4dc56d7dba5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 12:31:41 +00:00
Johanna Vanhatapio
5bf5cc0d50 Doc: Add info about the user feedback prompt
Fixes: QDS-3601
Change-Id: Ie7ceb09f142d233c4335e1445dac1618c8b00211
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 12:20:58 +00:00
Johanna Vanhatapio
f89b1ff497 Doc: Update more info about Library
Task-number: QDS-4007
Change-Id: Iede5ff19c55ea99453ad67b7f1782032779a77af
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 12:10:34 +00:00
Johanna Vanhatapio
6978020156 Doc: Fix Library paths in 3D topics
Task-number: QDS-4007
Change-Id: I2ff199857bae2b1e9e8df327194b7c59a0af27df
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 12:10:22 +00:00
Johanna Vanhatapio
381bb68265 Doc: Update info about Shapes
- Updated mainly pictures due to changes in the Properties view

Task-number: QDS-4167
Change-Id: I0ce5f83dc5d353eb7061761505454677d79aeb3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 11:42:33 +00:00
Leena Miettinen
67e264b619 Doc: Describe CMake multi-config support
Fixes: QTCREATORBUG-25595
Change-Id: I8b7c5ea64ba150c8bd5e8909c50bbaf716d89118
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-16 10:36:40 +00:00
Vikas Pachdha
1a9ed833d6 Docs: Add missing documentation for Photoshop plugin
Task-number: QDS-4125
Change-Id: I5d29ed6dbc3f6e7d921d0f56dc12b55a127ad9e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 09:31:18 +00:00
Vikas Pachdha
f9c1b0d307 Docs: Update sketch plugin images and add missing documentation
Task-number: QDS-4125
Change-Id: I0d2547b83dfdc9810870f9cda90ad6b3776a0aad
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 09:31:08 +00:00
Aleksei German
ddc6380c1b QmlDesigner: Fix for qdocconfig variable
Change-Id: I75364da1614b7ec641ba1321892245709694978e
Fixes: QDS-4185
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-16 09:26:59 +00:00
Ivan Komissarov
4e58b67195 Update Qbs submodule to the top of 1.19 branch
Change-Id: I3f46a900cc8a0a876db6b9dc2aa6d7ac94e3e053
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-16 08:24:37 +00:00
Thomas Hartmann
35118c2520 QmlJsCheck: Do not allow print as id
Task-number: QDS-4162
Change-Id: I425c75cd42c0842ead27a6c801c3a483284407ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-16 07:53:00 +00:00
Aleksei German
5be41e7ba1 Fix for QDS documentation generation
Change-Id: I66dc5912476719b9bb57d141784a6df7c7f55ac4
Fixes: QDS-4185
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-16 07:49:58 +00:00
Christian Kandeler
c80c724b52 ClangCodeModel: Fix template highlighting bug
We need to take into account that the ">>" in constructs such as
std::vector<std::pair<int, int>> is only one token on the clang side.

Change-Id: I90f002ca56f236032f6d39c338593a2ff7590061
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-16 07:02:19 +00:00
Christian Kandeler
8e8236e9e0 CppEditor: Add missing template arguments
... in "Add Virtual Methods From Base Class" quickfix.

Fixes: QTCREATORBUG-25589
Change-Id: I5ffef27acf151422ec4f56d48451e263664bfc2d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-16 07:00:10 +00:00
Miina Puuronen
8f2b6e65a9 QmlDesigner: Fix module categories visibility when module is removed
If a module is removed, its categories are now also set visible.

Fixes: QDS-4158
Change-Id: Ica1fd1f4d1d821bf74ea2ed57ff42849e8318539
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-04-15 16:10:53 +00:00
Eike Ziller
872660fcc5 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibc60debb3c409ae27e99df6071cf6115b272d6d8
2021-04-15 15:48:30 +02:00
Christian Kandeler
35f5cec986 QmlPreview: Fix qbs build
Amends 62a7601d50.

Change-Id: I531960e9ad3e183c993149d18855ffb03113d966
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-15 13:37:13 +00:00
Alessandro Portale
d7b9eac595 Utils: Make QtColorButton's d_ptr private, again
Amends: 03aed5c5a6

Change-Id: Ic9e99d4e63bc54f7931cefb084a7f5a215dbc109
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-15 13:01:56 +00:00
Marco Bubke
76bd140c7c UnitTests: Fix flaky test
ImageCacheGenerator.CleanIsCallingAbortCallback was not waiting for the
expected call.

Task-number: QTCREATORBUG-25580
Change-Id: I43265389a36e568dea7c7ece5524ef597232d049
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-15 12:05:20 +00:00
Mahmoud Badri
46a3645181 QmlDesigner: Update subcomponent manager only for added import
Subcomponent update is needed after an import is added to parse and
load the import components. Instead of updating all imports and folders,
just update the import folder when adding a new import. This also fixes
regression cause by: d3f2394e8f

Task-number: QDS-4179
Change-Id: I6c0ba5139818004fdf54dfa10f03c7b013dfa46d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-15 11:04:50 +00:00
Eike Ziller
7ba558da11 COIN: Simplify Qt installation
Use the new, simpler install_qt command and centralize definition
of Qt base URL and modules

Change-Id: I73d0b195c0cb6278d4f79476c42a39446d43eaed
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-04-15 10:56:22 +00:00
Leena Miettinen
dc636b63e6 Doc: Remove obsolete keyboard shortcut for Add Timeline
Task-number: QDS-4116
Change-Id: Ic7695ffea5cb6b1d1b224135660a4b9b5b4b06e9
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-15 10:48:28 +00:00
Tim Jenssen
0108a85c82 qmlpreview: prepare plugin to have an external client
- export the plugin andd add client creator API to be able to implement
  external debugtranslationclients
- use the private/qqmldebugtranslationprotocol_p.h from Qt5::QmlDebugPrivate
- have a basic client implementation which cares about changing language
- remove out of date elide warning implementation
- remove old ui
- remove the menu entry

The old client implementation is incompatible with the will be introduced
service and there was never an officially released compatible service.
Therefore we can remove the old client implementation without causing
any harm.

Change-Id: I26b5e8a99ba30ae6377443b3fffb05901b1cac28
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-15 09:32:01 +00:00
David Schulz
99fb1947f3 LanguageClient: remove outdated progress subtitle
If the work done end signal does not contain any message remove the
subtitle of the progress. Otherwise we still might show outdated
progress information on finished entries.

Change-Id: Ib1776e6cb1bacfa557b672182cd4e2c403266d1c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-15 07:23:53 +00:00
David Schulz
9bf89a9a9c LanguageClient: prevent detaching QList
Change-Id: Ifc650a8403cf31e0d84a37102e2c610693d33059
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-15 07:23:41 +00:00
Thomas Hartmann
d8737ffff4 QmlDesigner: Do not allow print as id
Task-number: QDS-4162
Change-Id: I7cce6fbeabff35e1d4469c93c73b02b56ff6d4a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-14 17:05:43 +00:00