feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangdfollowsymbol.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I45b7fee1a1d784c44f2139fb1ede69190d23d6fd
This commit is contained in:
Eike Ziller
2023-12-06 16:50:15 +01:00
parent 6a97b66592 d1ac2fe45a
commit 2e280e1c50
31 changed files with 330 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/remotelinux/genericdeploystep.cpp
View File

@@ -45,6 +45,7 @@ public:
ignoreMissingFiles.setLabelText(Tr::tr("Ignore missing files:"));
ignoreMissingFiles.setLabelPlacement(BoolAspect::LabelPlacement::InExtraLabel);
method.setSettingsKey("RemoteLinux.RsyncDeployStep.TransferMethod");
method.setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
method.setDisplayName(Tr::tr("Transfer method:"));
method.addOption(Tr::tr("Use rsync if available. Otherwise use default transfer."));