Commit Graph

47434 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Christiaan Janssen
d6cc05f0ea McuSupport: fix manual creation of kits
Kits are marked as 'manual', so that user has individual control of each one.
'Remove' button replaced with 'Update' button for manual update.

Task-number: QTCREATORBUG-25259
Change-Id: Iadf5f2da3ef7bee7fb051516ffda7fcefe8b56d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-14 10:07:50 +00:00
Christiaan Janssen
af24cad00f McuSupport: update dependency paths of kits if changed
Task-number: QTCREATORBUG-25488
Change-Id: I529b6243b799e35db5e9804087e4ed20224cb024
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-14 09:59:39 +00:00
Eike Ziller
555dbac851 Merge remote-tracking branch 'origin/4.15'
Change-Id: I613b60f7d5cfca19ed611b3777548738d7bd7d67
2021-04-14 11:33:16 +02:00
Eike Ziller
7716067994 PasteSelectDialog: Fix after refactoring
Don't compare int with QString - which even compiles with Qt 5 (but
luckily doesn't with Qt 6).

Amends 123133841e

Change-Id: I347568c89658896a2e094610dbf1700ff84d81c5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-14 07:02:23 +00:00
Mahmoud Badri
d3f2394e8f QmlDesigner: Don't update sub component manager when adding a module
It seems there is no need to update it and it is an expensive
operation.

Task-number: QDS-4008
Change-Id: I5dd8427f73a6ce755b017f6d284b72acb31ed7d5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-13 14:02:39 +00:00
Tapani Mattila
03aed5c5a6 Prevent QtColorButton crash with AnnotationTableView
Task-number: QDS-4068
Change-Id: I56c130e0d252f6926a64d0d0c37d3b482d2dbbc5
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-13 14:01:26 +00:00
Eike Ziller
34cd28aac0 Debugger: Fix compilation with Qt 6
Amends 7ccd9d6943

Change-Id: I8567a1238b9cc770c2a5ec551a06ef64a1164a0a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-13 12:33:22 +00:00
Eike Ziller
82bb6a3c72 CMake: Fix "Jump to File" with special characters
Fixes "Jump to File" from the context menu and the ctrl+click navigation
for files that contain special characters.

Fixes: QTCREATORBUG-25572
Change-Id: I7c26c6d517ced26f803c2224f0c09397f373b3b5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-13 12:32:29 +00:00
Eike Ziller
e160c962ac EditorManager: Do not save defaults to settings
And remove some legacy settings reading from Qt Creator < 4.0

Task-number: QTCREATORBUG-24762
Change-Id: Ie492787b78a19e9eb41650e36cbcd59b366deca7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-13 10:43:06 +00:00
Eike Ziller
4552552bc1 UpdateInfo: Do not save defaults to settings
Task-number: QTCREATORBUG-24762
Change-Id: Ie5fb6492847532b659fd7e0799b30f716c2c15fe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-13 10:42:54 +00:00
Christian Kandeler
226c03c1eb ClangTools: Give a hint to users as to why we didn't do anything
Task-number: QTCREATORBUG-25565
Change-Id: I27cb0e5bc2a02a88ddf1d42b996e45840d6c1385
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-13 10:12:57 +00:00
hjk
38b4536090 Utils: Introduce a BaseAspect::setEnabler(BoolAspect *)
A convenience method to tie the enabled state of an aspect to some
other bool aspect, to be used e.g. when settings item availability
depends on some check box.

Makes it harder to miss one of the three necessary steps.

Change-Id: I8c120bb6846aea2a503614f7c73fa57a149cab41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-13 09:59:58 +00:00
hjk
ef108d7a06 Docker: Add DockerDevice and a simple run config
The "Docker Container" runconfig executes 'docker run <image>' without
further attributes, and "works" with docker's hello-world example image.

Change-Id: Ib9417d238ac0757db16be1fc21af40c81db02f05
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-13 08:54:17 +00:00
hjk
162d551455 ProjectExplorer: Allow a device to declare that empty commands are fine
Docker allows to run a container "by itself", not needing an explicit
command line.

Change-Id: I4f3992410f7f7bbcce1897a7400628ef9354043d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-13 08:43:48 +00:00
hjk
c4631271d4 Perforce: Merge Settings and PerforceSettings classes
Structurally more similar to what the other plugins do.

Change-Id: Ic664277b089ebf60241fc8627353721e0e2f3002
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-13 08:08:44 +00:00
Christian Kandeler
413b83ddf9 QmakeProjectManager: Fix possible crash on project document reload
... while a parse is going on.

Fixes: QTCREATORBUG-25137
Change-Id: I02a914332ef120caee044139581e1901b4537bff
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-13 08:04:56 +00:00
hjk
f7310dd8fb ProjectExplorer: Add a RunConfiguration::setRunnableModifier()
To override RunConfiguration::runnable() behavior without the
need for subclassing. Will be useful for the docker plugin.

Change-Id: I9e8511faa95355038b08c3e3be24429d66a5253f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-04-13 07:43:33 +00:00
hjk
454e8a31e2 Analyzer: Base ISettingsAspect on Utils::AspectContainer
Change-Id: Ib4c19d0cb167911dc50d989771dd53f3569db087
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-12 13:15:13 +00:00
hjk
8eb74080ab QmlProfiler: Aspectify settings
Only four simple values.

Adapting qmlprofilerconfigwidget_test did not seem desirable,
as in the aspectified state this is hidden in the base aspects
implementations.

Change-Id: I933a8ca065169c61b7f25f109e0b7a0e6d21cb33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-12 11:29:16 +00:00
Christian Kandeler
b88b73d9c1 ClangFormat: Sprinkle some more magic pixie dust
Apparently, we can prevent clang-format from removing line breaks by
adding an empty comment at the end of the line.

Change-Id: Ia78ecb9e7351d059c544cbda11d33af5734e2218
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-12 09:28:55 +00:00
David Schulz
005f0a3127 TextEditor: Fix highlighting search results at block start
Fixes: QTCREATORBUG-25570
Change-Id: I3450cfed49e07cf96c2a2a9cdfa9a0be7a05c49f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-12 07:27:03 +00:00
Eike Ziller
8b2c9c4596 Merge remote-tracking branch 'origin/4.15'
Change-Id: I23d25ad32c396811acad88873ac556ee13372ee3
2021-04-12 09:18:06 +02:00
Bernhard Beschow
ac61bfdc90 AutoTest: Free TestTreeItem from CppTools dependency
Makes TestTreeItem programming language agnostic.

By moving the "query" methods to CppTools, the cohesion within these
methods is improved, i.e. information crosses the AutoTest <-> CppTools
border fewer times. Furthermore, it allows the CppTools plugin to see
how its data is being used, allowing it to optimize its queries
behind the scenes.

Change-Id: I0a60140abaca1193d500605dfa2812b4d937d94c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-12 06:42:49 +00:00
Marco Bubke
3f0f289b28 QmlDesigner: Relaxe value property setter
The value.isNull() was misleading. It should only check if a value is
invalid. The null sematics in Qt are special anyway because it they can be
misleading. Most values have no special "null" value like pointers or NaN
with floating point values. QString is for example exposes it's
implementation with a pointer. Sometimes zero is reportet as null but this
not what we wanted to know. So just treat null strings as empty strings.

Change-Id: I6599f6c97f22aff83779a0b32415bf52fd64d82f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-09 15:52:15 +00:00
hjk
3c0d7e9c18 Perforce: Aspectify settings
Change-Id: I2074b642166f135bb4617f9e14ac3e7b895720e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-09 15:38:25 +00:00
Christian Kandeler
33a38394b4 Core: Consider keyboard navigation in output window scrolling logic
... by using QAbstractSlider::actionTriggered() instead of the mouse-
centric signals.

Fixes: QTCREATORBUG-25557
Change-Id: I0092fbfcb8fefb3a234bfb1592a2483bdc9e68d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-09 14:54:19 +00:00
Aleksei German
12645efba0 QmlDesigner: Fix for Gradient Stops
Change-Id: I657b92cb00c0eda93b8dd74a2393072cc9ae9287
Fixes: QDS-680
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-09 14:20:31 +00:00
Eike Ziller
bce81fd992 Projects: Create QIcons in the UI thread
Creating QIcons elsewhere is not safe because of image reader plugin
loading and the pixmap cache.

Fixes: QTCREATORBUG-25301
Change-Id: Ia22a0cd571f808d7f5c639353fdf2e548743f8ca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-04-09 13:34:55 +00:00
Jarek Kobus
f4ab1279fd Fix a possible crash in StringTable on shutdown
The issue is that when a GC() function is being executed
in a separate thread, the main thread may delete
the StringTable (on shutdown) in the same time. The destructor of
StringTable didn't check in any way that the other
thread is still executing GC() method.

In order to fix it we employ runAsync method, returning
the handle to the running task. We store the handle
in futureSynchronizer, and in destructor of StringTablePrivate
we safely wait for all futures to be finished.

Fixes: QTCREATORBUG-25417
Change-Id: I0039d6041276c521c221e8dfc3894e84e47b82a2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-09 12:29:31 +00:00
Eike Ziller
2800f3b51f Merge remote-tracking branch 'origin/4.15'
Change-Id: I0afcf51d354ffd73a8f2956a7f78b1e4f032677b
2021-04-09 12:42:03 +02:00