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

Installing on a drive other than C: for Symbian OS

Browse Source 
Silent installation added to Sumbian's Run Configuration UI

Reviewed-by: Tobias Hunger
This commit is contained in:
Pawel Polanski
2010-07-20 13:37:15 +02:00
parent d980e37e24
commit c7278acda0
8 changed files with 125 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View File

@@ -128,6 +128,8 @@ bool S60DeployStep::init()
m_serialPortFriendlyName = SymbianUtils::SymbianDeviceManager::instance()->friendlyNameForPort(m_serialPortName);
m_packageFileNameWithTarget = runConfiguration->packageFileNameWithTargetInfo();
m_signedPackage = runConfiguration->signedPackage();
m_installationDrive = runConfiguration->installationDrive();
m_silentInstall = runConfiguration->silentInstall();
setDisplayName(tr("Deploy", "Qt4 DeployStep display name."));
QString message;
@@ -250,11 +252,14 @@ void S60DeployStep::startDeployment()
Q_ASSERT(m_launcher);
setupConnections();
//TODO sisx destination and file path user definable
const QString copyDst = QString::fromLatin1("C:\\Data\\%1").arg(QFileInfo(m_signedPackage).fileName());
const QString copyDst = QString::fromLatin1("%1:\\Data\\%2").arg(m_installationDrive).arg(QFileInfo(m_signedPackage).fileName());
m_launcher->setCopyFileName(m_signedPackage, copyDst);
m_launcher->setInstallFileName(copyDst);
m_launcher->setInstallationDrive(m_installationDrive);
m_launcher->setInstallationMode(m_silentInstall?trk::Launcher::InstallationModeSilent:
trk::Launcher::InstallationModeUser);
m_launcher->addStartupActions(trk::Launcher::ActionCopyInstall);
appendMessage(tr("Package: %1\nDeploying application to '%2'...").arg(m_signedPackage, m_serialPortFriendlyName), false);
@@ -347,7 +352,7 @@ void S60DeployStep::printCopyingNotice()
void S60DeployStep::printInstallingNotice()
{
appendMessage(tr("Installing application..."), false);
appendMessage(tr("Installing application on drive %1:...").arg(m_installationDrive), false);
}
void S60DeployStep::printInstallingFinished()