Commit Graph

50019 Commits

Author SHA1 Message Date
Thomas Hartmann
f51f2a90c6 QmlDesigner: Use QmlVisualNode for parent node
Change-Id: I06f5fbf3adeec24999798f57a5e2b835c3465b99
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-08 13:13:26 +00:00
Thomas Hartmann
3837c07711 QmlDesigner: Move createQmlObjectNode to QmlVisualNode
Change-Id: I6de1f84b54b0ee2489002c6d6e572c826de761ef
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-08 12:58:31 +00:00
Sergey Belyashov
96f3cef06a Fix lack of Q_OBJECT macro lupdate warning
Change-Id: Ida21090229aca6b900d80d4a1be1fa63e40e946f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-08 11:56:11 +00:00
Christian Stenger
890e62931c Python: Fix linking for mingw build
Change-Id: Id3a0718e49b4054aa65ef17b3c9ac889cbaf549f
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-08 07:49:35 +00:00
Christian Kandeler
88b4d44c50 ProjectExplorer: Do not set run config display names unnecessarily
... when restoring a target.
The run configuration may not have its default display name yet, in
which case all but the first restored run configuration would get a
number as its display name.

Fixes: QTCREATORBUG-23123
Change-Id: I5068cb85b67166357e0a88fb9638131a24e1340f
Reviewed-by: hjk <hjk@qt.io>
2019-11-07 15:45:35 +00:00
Cristian Adam
f930fb2b75 CMakeProjectManager: Do not convert PATHS to user output
CMake works natively with / for paths, if we convert them to \ on
Windows, and then give back to CMake, we end up having bad paths.

Change-Id: I44da27ba4927ec5b83c8e381a8c65ca3fca3505b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-11-07 13:52:35 +00:00
Alessandro Portale
aaef25f708 McuSupport: Set Kit's CMAKE_PREFIX_PATH for Desktop version
... make sure that CMake really finds the right Qt installation

Change-Id: I90083e4522111eac9b3658f4351536cfc798bf98
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-07 12:38:35 +00:00
David Schulz
cb908779a9 Editor: always paint complete line when painting current line highlight
If the paint event rect does not contain the complete line, request an
update with the full line width also for editable editors. This fixes
current line highlight issues in the commit reword editor.

Change-Id: I6b93230a47bdd61248c1aa9631208606cbbae7c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-07 09:59:05 +00:00
Richard Weickelt
77a033d397 Update qbs submodule
Change-Id: I05f86e403750434288cb36e363f10013d3c8f511
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-11-07 07:36:42 +00:00
David Schulz
30587e6dce LanguageClient: Do not add hover handler twice to editor
Check whether an editor already contains the hover handler before adding
to the list of handlers. Also remove the handler when a document is
deactivated for a specific client.

Change-Id: Iec1d3a0fd1dc3f02c8dd50b8968ff063efe2508a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-06 12:40:23 +00:00
Nikolai Kosjar
005e7aa54d C++: Fix crash in AlignofExpressionAST::clone()
...due to uninitialized member typeId.

Fixes: QTCREATORBUG-23184
Change-Id: I00afe87b9c61a1e8edefc122b1a99635736650cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-06 12:38:28 +00:00
Christian Stenger
00e89452bd TextEditor: Fix dropping explicitly set codec to System
If we set the default encoding to the System-wide encoding
we failed to distinguish them as separate encodings.
Explicitly handle 'System' encoding to avoid dropping
to the 'System' encoding when setting an encoding that
matches this one exactly.

Fixes: QTCREATORBUG-22843
Change-Id: Ib4fa50268ca6f792cdff001b9b07bb18804c4401
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-06 06:46:55 +00:00
Christian Stenger
85f5a8bd78 QmlDesigner: Fix possible crash
Fixes: QTCREATORBUG-23145
Change-Id: I389951aedf1d488e33775f331a76bf60ac26bf7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-06 06:46:43 +00:00
David Schulz
5634f112bd SyntaxHighlighting: update KSyntaxHighlighting engine to v5.63.0
Task-number: QTCREATORBUG-22558
Change-Id: I0902d5d866fc83fca2d508cab24dea8d7176240c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 10:11:54 +00:00
Christian Kandeler
f85f1df157 Update qbs submodule
To HEAD of 1.15 branch.

Change-Id: I29b65d46cee3eb8752c47494e7e9cded3b88d677
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-11-05 09:10:50 +00:00
Robert Loehning
cf3772ca77 Squish: Update testing ProjectWelcomePage
Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 05:42:53 +00:00
Alessandro Portale
096147d96d McuSupport Vendor specific flash/run CMake targets
The build system for QtMCU creates a CMake target
"flash_%1_and_bootloader" for STM targets but not for NXP targets.
Handle that (for now in a dirtry manner) in the run configuration.

In master branch we can add the API needed for the runconfiguration
to retrieve the list of available targets.

Change-Id: If2c9089a5dc004900424041898a6ff426ebb450b
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-04 18:28:27 +00:00
Alessandro Portale
af6ec7943e McuSupport: Tag "board" and Kit with vendor name
Needed for an upcoming hack, but also later when we "zero-config"
the boards.

Change-Id: I240cc252ebba458cab71db24740266756d0e8b37
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-04 17:47:57 +00:00
Alessandro Portale
ebc2628116 McuSupport: Adjust default path for SEGGER JLink
Change-Id: Iace2010f35bbaad3d1db749d6e05e2faa347c803
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-04 15:36:52 +00:00
Eike Ziller
34e8f58c47 Fix lupdate issues
Change-Id: Ib0cbb96a1a4857db5724f9d1e316b97bf2827dbd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-04 14:06:09 +00:00
Alessandro Portale
7d14132c8c McuSupport: Create a Qul-Desktop kit
First, hacky step towards supporting the "Qt" target. Such a target now
gets created with correct environment variables and CMake options.

Device type is for now Desktop, but portale thinks we will have a Qul/
Desktop target at some point.

Compiler and Qt version are randomly preselected and certainly need to
be adjusted by the user (for now).

Change-Id: Ie3f6a6e3ce1a46c35687e20a7550ff51b6b1b7c7
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-04 13:53:38 +00:00
David Schulz
2c112a51c3 Highlighter: update all editors after downloading additional definitions
Instead of just the editor with the info bar that was triggering the
download action or none editor if the action was triggered from the
settings dialog.

Change-Id: I4158eeb7fdb0a763d082c6d801b400e8635c7f38
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-04 13:45:19 +00:00
David Schulz
5ece12d4ea Highlighter: clarify 'Update Definitions' action
by renaming it to Download Definitions and adding a tooltip stating that it
collects all definitions that are missing or were updated after the release and
downloads it to the ksyntax highlighting user folder.
Also adding a separate reload definitions button in the settings behind
the user path.

Change-Id: I059cc98e33147cae910fa4fdb35631d1dca81448
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-04 13:23:58 +00:00
Nikolai Kosjar
9a567a48dd LanguageClient: Fix some bugprone-branch-clone
Change-Id: If1eb43168db65190983049f30bf217f0628e78e4
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-04 13:18:27 +00:00
Eike Ziller
ba8b537851 Update litehtml
Change-Id: I110616a1272cf995880671532008c52a5c068a74
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2019-11-04 10:35:10 +00:00
Eike Ziller
53819123e7 Simplify RPATHs for qmake build
Use central rpath.pri for setting RPATHs and qttestrpath.pri for tests.
Simplify install names of plugins and libraries on macOS to be just
@rpath/libName, which follows convention better and makes setting up
RPATHs easier.

Preparation for moving tools one directory level down on macOS, to
be able to add a qt.conf for the tools generically.

Task-number: QTCREATORBUG-23120
Change-Id: I16625d48904abd3a7f4c2ad7bbba5916cdc400cd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-04 10:31:55 +00:00
Christian Stenger
5f8efe43f2 AutoTest: Correct states handling when parsing boost tests
Do not miss to reset the parser state after a macro for a test
case or suite has been handled. In case of an early return
(usually when having incomplete or incorrect code) the wrong
state may be taken into account otherwise.

Change-Id: I2a981db9166fc6a21c2590406768ecaeee2852f2
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-04 10:17:27 +00:00
hjk
ac37146e27 ProjectExplorer: Export findFileInSession()
Would be useful for https://github.com/JakeSays/QtCreatorTerminalPlugin/

Change-Id: I6629c95535b5ce7af8f9d486005f41598b8dff47
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-04 09:14:44 +00:00
Christian Stenger
e7144e4883 QtSupport: Do not pass empty file names to file system engine
Fixes the 'Empty filename passed to function' warnings when using
registered self-built Qt without built documentation or examples.

Change-Id: I401b56246b1db1ed397c6df11b0714cd90058f48
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-11-04 08:19:22 +00:00
David Schulz
3df6a29d4f Python: remove reference to out of scope variable
Change-Id: Idd4dbab5ee01fda331452fefd27de71625afa5af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-11-04 08:03:17 +00:00
David Schulz
54f2ebf91d Python: cache the module path for executable
This reduces ui freezes when switching the interpreter for a python
project.

Change-Id: Iaa8ce8ed8d51666f8696eb96f504aaf8c4a11822
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-04 05:47:38 +00:00
Christian Stenger
37d378f479 QmlDesigner: Fix warning for unused variable
Amends e2e18ff625.

Change-Id: I4cae1131a8b7b46c3c11779df0926786debc4e0b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-11-04 05:45:35 +00:00
Christian Stenger
66e146314a PerfProfiler: Disable failing tests
Instead of rewriting the whole for each Qt version
temporarily disable them.

Change-Id: I33cf146a039c90d60f355ddf22274778255b9796
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-11-04 05:45:22 +00:00
Cristian Adam
db15da69dd CMake Build: Do not add test qrc file in normal plugin build
If you build without tests, you'll get an error.

Change-Id: Id4ce543da6f1a450f91c3f4fb2d862989339db7b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-11-01 16:55:09 +00:00
Cristian Adam
a1d22fd2f7 CppTools: Fix code model for Clang builds
If you build Qt Creator with CMake version 3.16, you will have
precompile headers which will break code model.

Change-Id: I679936faed39ecfedb9ebb5fb553449a9f5ea29d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-11-01 12:38:29 +00:00
Christian Stenger
c9086499f6 Debugger: Fix timeout handling
Task-number: QTCREATORBUG-21664
Change-Id: Ie6dec329443e9fa8e31e28f0fdd6d46a279804bb
Reviewed-by: hjk <hjk@qt.io>
2019-11-01 11:36:42 +00:00
Nikolai Kosjar
32fe77564e CppTools: Simplify
Change-Id: Id10cbcf541d8105265c531e63a64e2fd34e27379
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-01 09:53:45 +00:00
Christian Kandeler
5cd474522a Target setup page: Fix some glitches
- Make sure the "Manage" button is always enabled.
- Clear the list of possible build configs and collapse
  the details widget when a kit becomes unusable.
- Do not collapse the details widget when it gets selected.
- The "Details" button was sometimes grayed out when it shouldn't
  have been.

Change-Id: Ibc0f44213b633aebddfa7542d7dbdd0244df23f9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-01 09:44:49 +00:00
Nikolai Kosjar
6c1b11dd3e ProjectExplorer: Simplify
bugprone-branch-clone
readability-simplify-boolean-expr

Change-Id: Iaaac21e96a3e9db6b9819d77fdae623ede373e59
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-01 09:31:32 +00:00
Orgad Shaneh
c81e9a2406 CMake build: Fix false detection of mocable file
Q_OBJECT appears in a comment. It's not used in the code.

Change-Id: Ib3df3c4352fc07eddf8a626154b8fe8b753a9457
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-01 09:30:40 +00:00
Nikolai Kosjar
c48eedbc5a Debugger: Fix a bugprone-branch-clone
Change-Id: I7b9a3e416fa547de344dd5c4e111939200a7b824
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-11-01 09:26:34 +00:00
Nikolai Kosjar
d337d03ce1 CppEditor: Simplify
bugprone-branch-clone
readability-simplify-boolean-expr

Change-Id: Id30a155e224370713d23b4b534fb82f5e630f36c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-01 09:21:29 +00:00
Nikolai Kosjar
02a81b89c4 CMake: Simplify
Change-Id: I3e5fd3aebf8b11037d99ff367826ff8f8f436045
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-11-01 09:11:06 +00:00
Nikolai Kosjar
16e61cdf82 Utils: Simplify
bugprone-branch-clone
readability-simplify-boolean-expr

Change-Id: I75ad6118275ad9231f21b578567c3c042414263b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-01 09:10:31 +00:00
Nikolai Kosjar
eabc5e2bdd Core: Simplify
bugprone-branch-clone
readability-simplify-boolean-expr

Change-Id: I294133af65f68c3b9fc1f4c6fb0b93b9ff179a6e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-01 09:09:47 +00:00
Nikolai Kosjar
d13f7331b8 Help: Fix a readability-simplify-boolean-expr
Change-Id: I06006091b0e3b1c6b38851907a9e69f1c3c2fc04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-01 09:09:23 +00:00
Alessandro Portale
43e40f21a7 McuSupport: Detect GNU Toolchain for Arm a bit better
If there is exactly one subdir in the GNU Tools installation dir, pre-
select it.

Change-Id: I14cb2e46863884724d4eef2ecac83513c515ebee
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-11-01 08:56:11 +00:00
hjk
67ba6a5b9a Debugger: Fix conditional operator with identical true and false expressions
Change-Id: I1f85eed5355cd01590bc8cc0082f154e215a9ac3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-11-01 08:49:39 +00:00
Nikolai Kosjar
d4797587b1 ClassView: Fix a readability-simplify-boolean-expr
Change-Id: I6ad8009551f90dc2d2ab01698cc2d972cf47a79b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-01 08:41:11 +00:00
Thomas Hartmann
2e95916e7c QmlDesigner: Fix usage of transaction
We have to update the model _inside_ the transaction of course.
Without this patch the last changes were done after the
transaction was already closed.

Task-number: QDS-1194
Change-Id: I1061990f8b713ee5c25737b8eb173866fb495511
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-11-01 08:38:36 +00:00