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

Symbian: Inform the user about Smart Installer's manual installation

Browse Source
This commit is contained in:
Pawel Polanski
2011-01-17 14:41:00 +01:00
parent 5bc7652cf6
commit 673f9871ba
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
View File

@@ -96,6 +96,8 @@ public:
QStringList packageTemplateFileNames() const; QStringList packageTemplateFileNames() const;
QStringList appPackageTemplateFileNames() const; QStringList appPackageTemplateFileNames() const;
bool runSmartInstaller() const;
QVariantMap toMap() const; QVariantMap toMap() const;
signals: signals:
@@ -116,7 +118,6 @@ protected:
private: private:
void ctor(); void ctor();
bool runSmartInstaller() const;
bool isSigned() const; bool isSigned() const;
QString symbianPlatform() const; QString symbianPlatform() const;
QString symbianTarget() const; QString symbianTarget() const;

8
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -545,6 +545,7 @@ S60DeviceRunControl::S60DeviceRunControl(RunConfiguration *runConfiguration, QSt
m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS")); m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS"));
QTC_ASSERT(!m_qtBinPath.isEmpty(), return); QTC_ASSERT(!m_qtBinPath.isEmpty(), return);
m_executableFileName = s60runConfig->localExecutableFileName(); m_executableFileName = s60runConfig->localExecutableFileName();
m_runSmartInstaller = activeDeployConf->runSmartInstaller();
switch (activeDeployConf->communicationChannel()) { switch (activeDeployConf->communicationChannel()) {
case S60DeployConfiguration::CommunicationSerialConnection: case S60DeployConfiguration::CommunicationSerialConnection:
@@ -582,6 +583,13 @@ void S60DeviceRunControl::start()
m_launchProgress->setProgressValue(0); m_launchProgress->setProgressValue(0);
m_launchProgress->reportStarted(); m_launchProgress->reportStarted();
emit started(); emit started();
if (m_runSmartInstaller) { //Smart Installer does the running by itself
appendMessage(tr("Please finalise the installation on your device."), NormalMessageFormat);
emit finished();
return;
}
if (m_serialPortName.isEmpty() && m_address.isEmpty()) { if (m_serialPortName.isEmpty() && m_address.isEmpty()) {
m_launchProgress->reportCanceled(); m_launchProgress->reportCanceled();
QString msg = tr("No device is connected. Please connect a device and try again."); QString msg = tr("No device is connected. Please connect a device and try again.");

1
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -233,6 +233,7 @@ private:
QString m_executableFileName; QString m_executableFileName;
QString m_qtDir; QString m_qtDir;
QString m_qtBinPath; QString m_qtBinPath;
bool m_runSmartInstaller;
tcftrk::TcfTrkDevice *m_tcfTrkDevice; tcftrk::TcfTrkDevice *m_tcfTrkDevice;
trk::Launcher *m_launcher; trk::Launcher *m_launcher;