summaryrefslogtreecommitdiff
path: root/src/plugins/madde/qt4maemodeployconfiguration.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2012-08-22 16:52:38 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2012-08-24 15:44:03 +0200
commitc7ebfd47a49c8cc2cfb8cb34ada73e32a8611bb0 (patch)
tree6045564559d9cb0a485016997616bd1a1ba14e0f /src/plugins/madde/qt4maemodeployconfiguration.h
parentb80205c592cd3ecc768baba246b5e8df9a34c995 (diff)
downloadqt-creator-c7ebfd47a49c8cc2cfb8cb34ada73e32a8611bb0.tar.gz
RemoteLinux: Remove dependency on Qt4ProjectManager.
Instead use the newly added abstractions from ProjectExplorer. This makes the plugin qmake-independent in principle; any build system can be used as long as the respective QtCreator plugin provides a way to set up the required deployment information. As a side effect of this patch, two features are lost: (1) The ability to add a remote directory automatically for a RemoteLinux based target. This was rarely ever useful, because any non- trivial project requires more files to be deployed than just one binary. (2) The ability to add Desktop files and icons for Fremantle and Harmattan projects. Similar points as above apply here as well; such projects should be set up via QtCreator's wizards or manually by users who know what they are doing. Change-Id: I2d7e621256f01143aafe3b191b04a120f053e672 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/madde/qt4maemodeployconfiguration.h')
-rw-r--r--src/plugins/madde/qt4maemodeployconfiguration.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/plugins/madde/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h
index cc08f0ea35..116bef50c2 100644
--- a/src/plugins/madde/qt4maemodeployconfiguration.h
+++ b/src/plugins/madde/qt4maemodeployconfiguration.h
@@ -31,15 +31,9 @@
#ifndef QT4PROJECTMANAGER_QT4DEPLOYCONFIGURATION_H
#define QT4PROJECTMANAGER_QT4DEPLOYCONFIGURATION_H
-#include <remotelinux/deploymentsettingsassistant.h>
#include <remotelinux/remotelinuxdeployconfiguration.h>
#include <utils/fileutils.h>
-namespace RemoteLinux {
-class DeployableFilesPerProFile;
-class DeploymentSettingsAssistant;
-} // namespace RemoteLinux
-
namespace Madde {
namespace Internal {
@@ -71,17 +65,10 @@ public:
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const;
- QString localDesktopFilePath(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
-
static Core::Id fremantleWithPackagingId();
static Core::Id fremantleWithoutPackagingId();
static Core::Id harmattanId();
- RemoteLinux::DeploymentSettingsAssistant *deploymentSettingsAssistant();
-
- QString qmakeScope() const;
- QString installPrefix() const;
-
private slots:
void debianDirChanged(const Utils::FileName &dir);
void setupPackaging();