Commit Graph

28 Commits

Author SHA1 Message Date
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
hjk
f79a71df7b ProjectExplorer: Reduce use of Runnable in SimpleTargetRunner
Runnable functionality is nowadays mostly accessed more directly
in QtcProcess and its setup functions.

Change-Id: I2a2b5433aef1d464dc58d5a35069376dee051d57
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-25 10:32:23 +00:00
hjk
530b9ae85a ProjectExplorer: Copy more RunConfiguration data to RunControl
The aspects are now responsible for defining what data needs
to be copied and also to provide a suitable interface (kind
of source-compatible to direct use) for access.

The important change here is that RunControl::aspect(...) doesn't
need to access RunControl::runConfiguration() in fully aspectified
RunConfigurations anymore. In not-fully aspectified the runConfig
access is moved to the user code to make the problem visible there.
Long term, aspectification should be finished.

As an additional benefit, the resolving of macros etc can
now be done at the correct time.

Change-Id: I690d9f8f696ce9b4efd42082ba3f81b514efcb77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-04-12 08:43:09 +00:00
Jarek Kobus
3cfb242acd Remove unneeded includes of ports gatherer
Change-Id: I528e77a3464de59cd703b1800f2ba3187daa41c1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-02-28 11:27:50 +00:00
Jarek Kobus
f1e973de79 RunControl: Drop IDevice * from doStart()
Use device set inside passed runnable instead.

Grep for all usages of RunControl::start().
If passed device wasn't nullptr, set this device
inside passed runnable. Otherwise ensure that
passed runnable contains device set to nullptr.

Change-Id: I06fd42a16246fa9fedd81eeb47481a217f887cb0
Reviewed-by: hjk <hjk@qt.io>
2022-02-23 16:28:01 +00:00
Piotr Mućko
27cadc86ba McuSupport: plugin code formatting
Change-Id: I561bd66431ff3da7819bb9b2ff780197b5593708
Reviewed-by: hjk <hjk@qt.io>
2022-02-15 11:50:33 +00:00
Christiaan Janssen
fc25c76a4f McuSupport: provide RunConfigurations for multiple CMake targets
Task-number: QTCREATORBUG-26656
Change-Id: I2177044580f9137a5c530cc0a862d69d389fe447
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-12-20 08:10:36 +00:00
hjk
52e5023bcc ProjectExplorer: Use Utils::CommandLine in ProjectExplorer::Runnable
Change-Id: Id965f1f9047dcbc3ea5c9ddaa550d12668cf8ae6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 15:04:30 +00:00
hjk
4a42bcd4e8 Utils/ProjectExplorer: Use FilePath for Runnable::workingDirectory
... and in some using code.

Change-Id: I231ea56628908f7d305d13f07eabe8803fe8a791
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-06 12:51:24 +00:00
hjk
cec468d78a Utils/ProjectExplorer: Move re-usabled bits of aspects to Utils
Classes involved are BaseAspect and some derived classes,
LayoutBuilder and VariableChooser.

This is mostly mechanical, with various include/using changes
to make it compile.

Change-Id: I624a457f3555f102e541c4c71e33a9423af32250
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-23 07:44:42 +00:00
hjk
51e7bce109 ProjectExplorer: Rename Base*Aspect to *Aspect
In most cases they are used directly, so there's not much Base* in that.

Added the old name as alias as porting help for a while.

Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 07:35:43 +00:00
Eike Ziller
b18711da91 Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
	share/qtcreator/debugger/lldbbridge.py

Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
2020-07-06 16:23:13 +02:00
hjk
e1c88116b3 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 11:15:18 +00:00
Alessandro Portale
dccdd41ab9 McuSupport: Adjust license headers
Change-Id: I00ce0c63c59f6d20f8244ea9c693259044d0f7b8
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
2020-07-03 07:48:51 +00:00
Alessandro Portale
bc25c7b3fe McuSupport: Remove flashing of bootloader for STM
An earlier version of Qt for MCUs had run CMake targets like
flash_<application>_and_bootloader.

At some point they were removed. Now, Qt Creator will not use that CMake
target, as-well.

Change-Id: Ie122acd042f816fafd27779d164e87ec00c509a5
Reviewed-by: hjk <hjk@qt.io>
2020-02-19 12:57:37 +00:00
hjk
8d0361a8c9 McuSupport: Inline FlashAndRunConfiguration
Add a tr() to the label.

Change-Id: Iefacd6c6646b9f5e5124d907d0516ebc5556ae76
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-12 10:41:03 +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
bfa061909c McuSupport: Honor user changes of flash and run call
Actually execute what is in the BaseStringAspect, which was potentially
edited by the user.

Change-Id: Ic172c0e6bfa1034223f93eee58cae9542fa7d706
Reviewed-by: hjk <hjk@qt.io>
2019-11-28 19:41:53 +00:00
Eike Ziller
6fc85b49fa Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
2019-11-28 08:24:10 +01:00
hjk
d0c5577a7b McuSupport: Use new runconfiguration aspect update mechanism
And do not connect to buildConfigurationChanged. It's not needed,
and listens to the wrong BuildConfiguration after the first change.

Change-Id: I9d5dc8593ed5610aaf64e6717a694710a137b344
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-11-25 17:44:13 +00:00
Alessandro Portale
d65c61ffcb McuSupport: Fix name of McuSupportRunConfigurationFactory
Was a remainder of initial clone&rename action.

Change-Id: Ifd06626cf2c895a1e20289ebd7ce711432f0a23a
Reviewed-by: hjk <hjk@qt.io>
2019-11-22 17:25:55 +00:00
Alessandro Portale
a2355841f5 McuSupport: Rename internal types
"PackageOptions" -> "McuPackage"
"BoardOptions" -> "McuTarget"
"qul" -> "qtForMCUs"

Change-Id: I209cc82c7516fbf6a960b26c440159dbab02a4db
Reviewed-by: hjk <hjk@qt.io>
2019-11-15 08:07:37 +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
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
907c35dc00 McuSupport: Enable and preselect usage of the shipped JOM (on Windows)
- Set CMake generator to "NMake Makefiles JOM"
- Add ICore::libexecPath to environment path
- Set the environment for the run configuration

Change-Id: Ie7b2dc1513b366911b429d77cc4a1954be531075
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
2019-10-31 15:16:26 +00:00
Alessandro Portale
3cff6f447a McuSupport: Make RunConfiguration flash and run the app
For now with flash_*_and_bootloader, and later perhaps with an option to
flash without bootloader and without assets.

Change-Id: I861d8d4f269dcb9b57447217f78825ce232c903e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-10-09 10:36:24 +00:00
hjk
b0ea4311e8 Short live McuSupport
Medium term to be merged with BareMetal/RemoteLinux/...

Change-Id: I444c65bcfa8e3cf8642ff64e964459720814860a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-30 15:04:32 +00:00