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

Merge branch '2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
This commit is contained in:
Oswald Buddenhagen
2011-07-25 13:57:13 +02:00
parent 76a5b1953c 899cc03003
commit ae8ac2eb2f
196 changed files with 3087 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/remotelinux/genericdirectuploadservice.cpp
View File

@@ -158,6 +158,15 @@ void GenericDirectUploadService::handleUploadFinished(Utils::SftpJobId jobId, co
handleDeploymentDone();
} else {
saveDeploymentTimeStamp(d);
// Terrible hack for Windows.
if (d.remoteDir.contains(QLatin1String("bin"))) {
const QString remoteFilePath = d.remoteDir + QLatin1Char('/')
+ QFileInfo(d.localFilePath).fileName();
const QString command = QLatin1String("chmod a+x ") + remoteFilePath;
connection()->createRemoteProcess(command.toUtf8())->start();
}
uploadNextFile();
}
}