Commit Graph

61956 Commits

Author SHA1 Message Date
Christian Kandeler
f29a4440fe Qnx: Add QnxRunConfiguration::doAdditionalSetup()
Same principle as in b526d789cf.

Change-Id: I79b69f709ab401b46d2edef3b5a6b0672e30eaff
Reviewed-by: hjk <hjk@qt.io>
2019-12-12 13:45:38 +00:00
Christian Kandeler
864e79980b Boot2Qt: Add QdbRunConfiguration::doAdditionalSetup()
This amends b526d789cf. I had forgotten that Boot2Qt no longer inherits
from RemoteLinux.

Fixes: QTCREATORBUG-23315
Change-Id: Ic0fa4d54df4b7957916be67ec515df57f2fb2ce1
Reviewed-by: hjk <hjk@qt.io>
2019-12-12 13:43:17 +00:00
Christian Stenger
f66aaf1aa9 BareMetal: Fix compile for gcc 5.3
Amends 7ea7629ac4.

Change-Id: Ib65f8cce0468bb2ea08ae012344ab19b4c74736e
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-12-12 05:53:29 +00:00
Henning Gruendl
88bbd748dd QmlDesigner: Fix material manager
Task-number: QDS-1332
Change-Id: I70828c3ce584ab72115f92dda4a27341e00085e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-11 15:07:47 +00:00
Christian Kandeler
bc921261b1 ProjectExplorer: Close the target selector on a double click
Before this patch, users needed to click outside of the widget to close
it using the mouse, which was slightly annoying.

Fixes: QTCREATORBUG-21846
Change-Id: I051cde8e76cd2294f2888fb45904824a39653488
Reviewed-by: hjk <hjk@qt.io>
2019-12-11 15:02:16 +00:00
Andrey Sobol
7ea7629ac4 BareMetal: Add new gdbServerProvider - EBlink
Details:
* Support new gdb server for ARM mcu on Windows and Linux clones.
* Tested STN32F103RE NucleoBoard with cMake ProjectManager.
* Project pages https://github.com/EmBitz/EBlink.
* Need to set on GdbExtended page "Use asynchronous mode to control inferior".
* UnCheck "Show a message box when receiving a signal".
  On stop long process a EBLink gdb server sends SIGTRAP signal.
  OpenOcd sends SIGINT and the message box do not appear.

Change-Id: If2b889b25e1fde46edef3feff9d50d03a65b1a53
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2019-12-11 14:28:39 +00:00
hjk
c654677bf7 Standardize RunConfiguration id specification
Use the cheapest of all patterns used so far, they are only used exactly
once.

Normalizing the id values to a common patters is not as simple as they are
stored in .user files.

Change-Id: Ib4d037a88a7a5ca2ea94dfb3933d17122c89240f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-11 14:07:40 +00:00
Christian Kandeler
97edfa7b58 RemoteLinux: Allow custom command line in MakeInstallStep
Let users tweak the "make install" command, in case they have special
requirements.

Fixes: QTCREATORBUG-23320
Change-Id: Ifa3c7bc499ef1e5d277fdb4cdac461aae575fd6b
Reviewed-by: hjk <hjk@qt.io>
2019-12-11 13:56:38 +00:00
hjk
4e3bc88eef Nim: Use generic RunConfiguration::update setup
Change-Id: I531357a05d01a29ddb9a5d33be1bfac9ca0cc9dd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-11 12:29:19 +00:00
Christian Stenger
3094d5b3ae QmlDesigner: Fix missing forward declare
Amends f26d770322.

Change-Id: I2ed208c54ec0f5d2e398870d9fede985d05c38b6
Reviewed-by: hjk <hjk@qt.io>
2019-12-11 11:59:58 +00:00
hjk
d1d9df60b6 CMake: Dissolve CMakeExtraBuildInfo
The information is effectively derivable from kit and build type, so
do it only when needed.

Change-Id: Ideb4e5106a6a0632ade98aad894d5b7aa6f83126
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-11 11:27:25 +00:00
Miikka Heikkinen
783e5d0a8d Use separate MouseArea3D to calculate drag vector
Using the MouseArea3D linked to gizmo to manage the drag leads to
slight unwanted drift on the drag plane, as it moves with the gizmo.
Fixed by using a helper MouseArea3D to calculate drag vector.
Helper area's transform is set at mouse press time and is not changed
during the drag.

Change-Id: I50d3f738277bd34005c977423d114abc8dbed520
Fixes: QDS-1312
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-11 10:59:21 +00:00
Miikka Heikkinen
128c7a34af QmlDesigner: Update selection box on parent change
Selection box geometry update sets explicit global transform for
selection box root. The transform depends on the target node
parent, so if the parent changes, the box needs to be updated.

Change-Id: Iccf8b7e863bcfe541bbb4f60a4094739a7513e8d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2019-12-11 10:59:10 +00:00
Alessandro Portale
d486bc4749 ClangTools: Show clang-tidy/clazy documentation Urls as tooltip
Disclose up-front where the link leads to.

Change-Id: I6b6b1df93eb4d7870b809a71adc1bd10518e7c8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-11 10:43:33 +00:00
Tobias Hunger
0518fd34ca Add conanfile.txt
Add a conanfile.txt, so that users can run "conan install ." to
build all the required dependencies.

Afterwards users can run:

  cmake -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake /path/to/qtc -GNinja

to configure using the conan-provided dependencies.

Change-Id: Id81c703fc48de4d3d66e81ef58acc60dfed48dac
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-12-11 10:35:59 +00:00
Aleksei German
f26d770322 QmlDesigner Connection Delete Shortcut replacement
Task: QDS-1320
Change-Id: I1a94d30710d58dfbd8e90a45133700af20fc2980
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-12-11 09:13:03 +00:00
hjk
668f1b667a CompilationDatabase: Remove unnneded ::fromMap() reimplementaion
Change-Id: I2e9440f146b8ba485d3080e74927a05ae7d68824
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-11 07:04:14 +00:00
Alessandro Portale
116451ba1b CppTools: Update clang-tidy documentation URL
8.0.0 -> 8.0.1

Change-Id: Ic58777d2e97711e12e208c1b2a709bb0a9279e41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-11 05:48:50 +00:00
Christian Kandeler
16e3e44ce7 QmlDesigner: Fix more warnings about unused parameters and functions
Change-Id: I8b569fcf60a0a21c6828d612997bbba0f737c806
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-12-10 17:20:55 +00:00
Alessandro Portale
27a5d50125 ManhattanStyle: Fix themed drawing of toolbar extension
The extension image gets queried via QStyle::standardIcon() instead of
QStyle::standardPixmap(). That's why so far our extension was never
drawn with our own icon.

The icon .png needed to be resized in order not to be resampled in @2x
mode.

Change-Id: I27ae4e5872c18421e5d40271b01cb9daf8adc8bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-12-10 13:34:39 +00:00
Christian Kandeler
ef135cc549 ProjectExplorer: Fix crash
One must not call std::next() on a non-dereferenceable iterator.

Change-Id: Id40341f808a3781f91f8aef1930bb76a397e8053
Reviewed-by: hjk <hjk@qt.io>
2019-12-10 12:48:40 +00:00
hjk
0e49f11ca3 Debugger: Avoid a few clang warnings
Change of signedness and/or size.

Change-Id: I126d36d406afbba4b7383bf8326d845db79cdde7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-10 11:43:50 +00:00
hjk
b1a29dedfc ProjectExplorer: Pass parameters to BuildConfiguration initialization
... directly again, mostly undoing the temporary hack from fb631cb258.

Change-Id: I4485dcb23765d99b4b5869973f004457ebd7aa7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-10 11:43:33 +00:00
David Schulz
017ed74400 LanguageClient: Fix crash on closing qc while restarting a server
Reset the assist providers when restarting a server, so the client can
be safely shutdown while closing Qt Creator.

Change-Id: I4d5f18582a8c67cbe02974d72fcef9703ed64dc4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.11.0
2019-12-10 11:34:30 +00:00
David Schulz
d935f2fe6a add python improvements to changes file
Change-Id: I07518d60b21770554d8fc944631b907411fd4ee9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 11:34:16 +00:00
David Schulz
cbdcde0603 Python: Reset editor info bars when closing document
Fixes crash after reopening a python document and configuring the python
language server in the reopend document.

Change-Id: I42eb6c5d3ccb755a836fd9071b3147d65c8c0ab6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 11:30:58 +00:00
hjk
2ab33d1dc9 CMake: Remove CMakeBuildConfiguration::project() overload
The base version is good enough nowadays.

Change-Id: I2e2ca690a29f9b877309ca98038d211d5c678fbd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-10 11:27:55 +00:00
Christian Kandeler
b526d789cf RemoteLinux: Add RemoteLinuxRunConfiguration::doAdditionalSetup()
This became necessary after commit b1dbd7e358, because now run
configurations are created after parsing has finished, so they will not
initially receive the signals that cause them to update their target
information.

Fixes: QTCREATORBUG-23315
Change-Id: I761e5a5bd4ed6015037f562c10792fe16147739a
Reviewed-by: hjk <hjk@qt.io>
2019-12-10 10:20:54 +00:00
Alessandro Portale
984938a451 Android: Log Sdk manager calls
... helps finding reason for logged parsing errors.

Change-Id: Ia544d7d042e3eb8db04c122fe9f2f8e753e8ef4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 09:36:04 +00:00
Tobias Hunger
a8b96a8240 CMake: More logging of parsing starting/stopped
Change-Id: I52dad9260c21e03add513f7229148635ae76236a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-10 09:16:22 +00:00
hjk
03de3bc602 Debugger: Remove some unused declarations
Change-Id: I38f92b674b97f542e1e50dabe48f3054f7c48518
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 09:08:05 +00:00
hjk
375c3209e7 Debugger: Save a few bytes in DebuggerSettings
Doesn't have to be a QObject.

Change-Id: I9a78d5c8103b74e34c202ad652016cec956298b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 09:01:39 +00:00
hjk
53a4c6eda0 Debugger: Remember sizes and order of the columns in the debugger views
Task-number: QTCREATORBUG-23341
Change-Id: I405be5361e732eccadebd1f51d90c7a3229a2e5e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-10 08:53:19 +00:00
Alexander Akulich
0d76a01379 ProjectExplorer: Update CMake target on DesktopRunConfiguration cloned
Call updateTargetInformation() for all kinds of configuration to fix ExecutableAspect
initialization.

Change-Id: Ie568f589fd6a6570fe84353bf145f7f87d1f0448
Reviewed-by: hjk <hjk@qt.io>
2019-12-10 08:34:47 +00:00
Christian Stenger
ee77b4fca3 QmlJS: Fix type lookup
Amends 8f682573a8.

Task-number: QTCREATORBUG-15684
Change-Id: I2d35e8f88612d5834519931d00049aa1a99d47c8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-12-10 08:21:06 +00:00
hjk
041a86c8c7 ProjectExplorer: Use function object for special build config init
Change-Id: I5da0f28ee1a64f8d9a3145f059019be702bee463
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-09 14:12:45 +00:00
Christian Kandeler
b82add7813 ResourceEditor: Fix priority for qrc sub-nodes
When adding a new file to a qrc file via the context menu, the wrong
project tree node was pre-selected in the wizard unless the user had run
the context menu either from the ".qrc" node or a qrc prefix node that
was *not* the one for the "/" prefix.
Now this works correctly for all nodes at or below the ".qrc" node.

Fixes: QTCREATORBUG-23210
Change-Id: Ia5e234e9861a480f973b76f8e3026ebc9c73ec35
Reviewed-by: hjk <hjk@qt.io>
2019-12-09 13:48:41 +00:00
Christian Stenger
8f682573a8 QmlJS: Improve support for multiple imports into same alias
Add extra handling for aliased imports to avoid handling
shadowed imports as unknown which in turn ignored them
and marked their members as unknown types and did not
provide auto completion for their members.

Fixes: QTCREATORBUG-15684
Change-Id: Iee1009cbdfde13ce261854c3239b9b50c434f563
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-12-09 11:37:26 +00:00
The Qt Project
e5f1559bb6 Merge "Merge remote-tracking branch 'origin/4.11'" 2019-12-09 10:49:19 +00:00
Tobias Hunger
56b82c41c4 SDKTool: Allow for explicitly unsetting Qt in addKitOperation
Treat a empty string passed in as argument to --qt as "No Qt" by
forcing that to "-1".

Fixes: QTCREATORBUG-23168
Change-Id: I03c536d0cc0f7bc2ad291a2bbcc5297df509b524
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-09 10:31:30 +00:00
Alessandro Portale
79bbe93c1b Android: Make more logged command calls copy&pasteable
Change-Id: I43e01efc4cb583235ad2d97150d4478b23558659
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-09 10:23:16 +00:00
Orgad Shaneh
49f6b0146a Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
2019-12-07 18:39:54 +02:00
Alessandro Portale
9eed77fe86 McuSupport: Set jom via CMAKE_MAKE_PROGRAM instead of adding it to Path
Let's add less to the Path variable of the Kit's build environment. If
jom.exe is present, define it via CMAKE_MAKE_PROGRAM, set the CMake
Generator to Jom and hide the CMake Generator setting.

Change-Id: I58de73dc631f753d3e5c1706e593afb923fcb588
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-06 20:08:13 +00:00
hjk
3c41b91d44 ProjectExplorer: Settle on fixed set of build step lists
Even if the implementation allowed different lists than 'build'
and 'clean', that's the only set that has been used, ever.

If really needed, this could be re-instated, but for now having
them fixed removes part of the neeed for a two-phase construction
and helps to simplify user code.

Change-Id: I3df09a1829a7d020ef8963d358ea80f8d199ba13
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-06 14:49:59 +00:00
Alessandro Portale
a44562f676 McuSupport: Check for presence of CMake
If no CMake tool is present, direct the user to the CMake settings,
insted of creating non-functional kits.

Change-Id: I0326b1fd37a0475a3a2983ad6108729b0c54d87c
Reviewed-by: hjk <hjk@qt.io>
2019-12-06 13:38:07 +00:00
Alessandro Portale
51e93af2de Android: Distinguish OutputParser MarkerTag for available updates
Change-Id: Ia8389050d8be71454029e1a2848a29de33391f2a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-12-06 13:37:55 +00:00
Aleksei German
9ad731fc9d QmlDesigner ConnectionViewWidget delete quick fix
Change-Id: I0147a73fb9358a4fd5949308e95ddb1bdd934e3f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-06 13:26:46 +00:00
Aleksei German
0adf810587 QmlDesigner Action Editor for Connections View
Task: QDS-1261
Change-Id: I81e6687e31a0f987ba15dc81dd52f240e4ea9689
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-06 13:26:30 +00:00
Henning Gruendl
60f27c609a QmlDesigner: Add item layer properties
Task-number: QDS-1305
Change-Id: I0d6a390ac05f6bda9f11ecb25b461c95519d8bb3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-12-06 13:21:35 +00:00
Henning Gruendl
f4d6300b0b QmlDesigner: Add control for material management
- Create EditableListView for material management
 - Add id list functionality to PropertyEditorValue

Task-number: QDS-1258
Task-number: QDS-1256
Change-Id: I1694648b36845b22f4773ecbd578d77c22c934e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-12-06 13:11:30 +00:00