diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-22 18:17:07 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-22 18:22:23 +0100 |
| commit | 5211256549d4ece7d40d883d0e52e49a72c2f477 (patch) | |
| tree | 6922eb448254cea328275be44ef718586234361e /src/plugins/madde | |
| parent | c43415e4ea6b52fa7d026ce076346ee2218eafef (diff) | |
| download | qt-creator-5211256549d4ece7d40d883d0e52e49a72c2f477.tar.gz | |
RemoteLinux: Don't make presence of device an absolute prerequisite ...
... for deployment and running.
Rationale: An emulator might get started on-demand during deployment
and get auto-detected in the process.
Change-Id: Id95ccccbf4d570f9fa69a6ed3a8a473fd63c5968
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/madde')
| -rw-r--r-- | src/plugins/madde/maddeuploadandinstallpackagesteps.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/madde/maemodeploybymountsteps.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp index 25fa89bf0a..67dbbda4c5 100644 --- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp +++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp @@ -155,7 +155,7 @@ bool MaemoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con return false; } m_deployService->setPackageFilePath(pStep->packageFilePath()); - return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot); + return deployService()->isDeploymentPossible(whyNot); } QString MaemoUploadAndInstallPackageStep::stepId() @@ -202,7 +202,7 @@ bool MeegoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con return false; } m_deployService->setPackageFilePath(pStep->packageFilePath()); - return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot); + return deployService()->isDeploymentPossible(whyNot); } QString MeegoUploadAndInstallPackageStep::stepId() diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp index 97adf54ecd..969daeb184 100644 --- a/src/plugins/madde/maemodeploybymountsteps.cpp +++ b/src/plugins/madde/maemodeploybymountsteps.cpp @@ -430,7 +430,7 @@ bool MaemoInstallPackageViaMountStep::isDeploymentPossible(QString *whyNot) cons return false; } m_deployService->setPackageFilePath(pStep->packageFilePath()); - return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot); + return deployService()->isDeploymentPossible(whyNot); } QString MaemoInstallPackageViaMountStep::stepId() @@ -476,7 +476,7 @@ bool MaemoCopyFilesViaMountStep::isDeploymentPossible(QString *whyNot) const for (int i = 0; i < deployableCount; ++i) deployableFiles << deploymentInfo->deployableAt(i); m_deployService->setDeployableFiles(deployableFiles); - return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot); + return deployService()->isDeploymentPossible(whyNot); } QString MaemoCopyFilesViaMountStep::stepId() |