Commit Graph

10 Commits

Author SHA1 Message Date
Ville Nummela
a36e031cf5 ProjectExplorer: Split deployment data using last colon on the line
The original approach does not work with absolute file paths on Windows

Change-Id: I9f284dfa7c0fe145a99e216a571d3f0eb1289f94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-05-26 04:47:27 +00:00
Christian Kandeler
3894dbfa65 ProjectExplorer: Make DeploymentData::addFile() do what its name says
The check that was done in there was problematic for two reasons:
    - It encoded a policy that a file could not be deployed to more than
      one target path, which might not always be true.
    - It made the function unexpectedly expensive, resulting in
      quadratic behavior for repeated calls. This resulted in noticeable
      UI lag when loading larger projects.
It's the caller's responsibility to prevent duplicates.

Task-number: QTCREATORBUG-18533
Change-Id: I33a328b14f95fe84b3c1041d4b74d645946250bb
Reviewed-by: hjk <hjk@qt.io>
2020-02-07 10:55:21 +00:00
Eike Ziller
fcb12a275f Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/projectexplorer/deploymentdata.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I64c304fc71435629a6a0060a9df71e8952699508
2019-10-16 15:27:22 +02:00
Christian Kandeler
d56e88d36a RemoteLinux: Fix look-up of remote file path in deployment data
If the deployment configuration contains an "install into temp dir"
step, then the local file paths of the binaries built by the build tool
will not be in the list of deployable files, because all deployables
come from the temporary install dir. Therefore, look for just a file
name match as a fallback.

Fixes: QTCREATORBUG-21235
Change-Id: Ie3fad515515b4f28cc6bdef1254f4c05a0557569
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-10 07:42:18 +00:00
hjk
ae11f30b20 ProjectExplorer: Proliferate FilePath
DeployableFile and fallout.

Change-Id: I9a9c56e4a4ebf8f68df70d65da2e699efedfe907
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-29 05:42:13 +00:00
hjk
6a58666f44 More Utils::toSet/toList
... and unrelated cosmetic changes.

Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-04 12:28:38 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
Christian Kandeler
1950b38668 GenericProject: Set deployment data, if available
We use the same approach as for CMake, namely the
QtCreatorDeployment.txt file.

Fixes: QTCREATORBUG-19202
Change-Id: I50605b8236b26f0c911e2448330019e94753af19
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-11-14 13:04:25 +00:00
Christian Kandeler
73b1a765f3 Move evaluation of QtCreatorDeploymentData.txt to ProjectExplorer
We want to re-use it outside of the CMakeProjectManager.

Change-Id: I7550f86704bb7c2a683e831cf8827d5b0f6d90f6
Reviewed-by: hjk <hjk@qt.io>
2018-11-14 13:03:12 +00:00
Christian Kandeler
2cac5c0f0c ProjectExplorer: Add deploymentdata.cpp
We will add more code to the DeploymentData class, and we don't want it
all to be inline.

Change-Id: I5d51d5d44078e6a38262925be21d447ebd8f629e
Reviewed-by: hjk <hjk@qt.io>
2018-11-14 10:24:38 +00:00