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

Maemo: Fix deployment issues with disabled packaging.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-12 08:00:34 +02:00
parent a0d1d7af4a
commit 37fa34e269
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -352,8 +352,10 @@ void MaemoDeployStep::start()
const int deployableCount = m_deployables->deployableCount(); const int deployableCount = m_deployables->deployableCount();
for (int i = 0; i < deployableCount; ++i) { for (int i = 0; i < deployableCount; ++i) {
const MaemoDeployable &d = m_deployables->deployableAt(i); const MaemoDeployable &d = m_deployables->deployableAt(i);
if (currentlyNeedsDeployment(hostName, d)) if (currentlyNeedsDeployment(hostName, d)
|| QFileInfo(d.localFilePath).isDir()) {
m_filesToCopy << d; m_filesToCopy << d;
}
} }
} }
@@ -650,6 +652,8 @@ void MaemoDeployStep::installToSysroot()
+ d.remoteDir + sep + QFileInfo(d.localFilePath).fileName(); + d.remoteDir + sep + QFileInfo(d.localFilePath).fileName();
sysRootDir.mkpath(d.remoteDir.mid(1)); sysRootDir.mkpath(d.remoteDir.mid(1));
QFile::remove(targetFilePath); QFile::remove(targetFilePath);
QString dummy;
MaemoGlobal::removeRecursively(targetFilePath, dummy);
if (!MaemoGlobal::copyRecursively(d.localFilePath, targetFilePath)) { if (!MaemoGlobal::copyRecursively(d.localFilePath, targetFilePath)) {
writeOutput(tr("Sysroot installation failed: " writeOutput(tr("Sysroot installation failed: "
"Could not copy '%1' to '%2'. Continuing anyway.") "Could not copy '%1' to '%2'. Continuing anyway.")

1
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View File

@@ -30,7 +30,6 @@
** Nokia at qt-info@nokia.com. ** Nokia at qt-info@nokia.com.
** **
**************************************************************************/ **************************************************************************/
#include "maemoglobal.h" #include "maemoglobal.h"
#include "maemoconstants.h" #include "maemoconstants.h"