Conflicts: src/libs/utils/fileutils.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/genericdirectuploadservice.cpp src/tools/qtcreatorcrashhandler/main.cpp Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
