1 files changed, 28 insertions, 44 deletions
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 221172e322..8246f6b39d 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -9,61 +9,58 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "Qt4ProjectManager" }
     Depends { name: "QtSupport" }
     Depends { name: "QtcSsh" }
 
-    Depends { name: "cpp" }
-    cpp.includePaths: [
-        "..",
-        "../../libs",
-        buildDirectory
-    ]
-
     files: [
         "abstractpackagingstep.cpp",
         "abstractpackagingstep.h",
         "abstractremotelinuxdeployservice.cpp",
         "abstractremotelinuxdeployservice.h",
+        "abstractremotelinuxdeploystep.cpp",
         "abstractremotelinuxdeploystep.h",
         "abstractuploadandinstallpackageservice.cpp",
         "abstractuploadandinstallpackageservice.h",
-        "deployablefile.h",
-        "deployablefilesperprofile.cpp",
-        "deployablefilesperprofile.h",
-        "deploymentinfo.cpp",
-        "deploymentinfo.h",
-        "deploymentsettingsassistant.cpp",
-        "deploymentsettingsassistant.h",
         "embeddedlinuxqtversion.cpp",
         "embeddedlinuxqtversion.h",
         "embeddedlinuxqtversionfactory.cpp",
         "embeddedlinuxqtversionfactory.h",
         "genericdirectuploadservice.cpp",
+        "genericdirectuploadservice.h",
+        "genericdirectuploadstep.cpp",
         "genericdirectuploadstep.h",
         "genericlinuxdeviceconfigurationfactory.cpp",
         "genericlinuxdeviceconfigurationfactory.h",
+        "genericlinuxdeviceconfigurationwidget.cpp",
+        "genericlinuxdeviceconfigurationwidget.h",
+        "genericlinuxdeviceconfigurationwidget.ui",
         "genericlinuxdeviceconfigurationwizard.cpp",
         "genericlinuxdeviceconfigurationwizard.h",
         "genericlinuxdeviceconfigurationwizardpages.cpp",
         "genericlinuxdeviceconfigurationwizardpages.h",
         "genericlinuxdeviceconfigurationwizardsetuppage.ui",
-        "genericlinuxdeviceconfigurationwidget.cpp",
-        "genericlinuxdeviceconfigurationwidget.h",
-        "genericlinuxdeviceconfigurationwidget.ui",
         "genericremotelinuxdeploystepfactory.cpp",
         "genericremotelinuxdeploystepfactory.h",
         "linuxdevice.cpp",
         "linuxdevice.h",
         "linuxdevicetestdialog.cpp",
         "linuxdevicetestdialog.h",
+        "linuxdevicetestdialog.ui",
         "linuxdevicetester.cpp",
         "linuxdevicetester.h",
+        "packageuploader.cpp",
+        "packageuploader.h",
         "publickeydeploymentdialog.cpp",
         "publickeydeploymentdialog.h",
         "remotelinux.qrc",
         "remotelinux_constants.h",
         "remotelinux_export.h",
+        "remotelinuxcheckforfreediskspaceservice.cpp",
+        "remotelinuxcheckforfreediskspaceservice.h",
+        "remotelinuxcheckforfreediskspacestep.cpp",
+        "remotelinuxcheckforfreediskspacestep.h",
+        "remotelinuxcheckforfreediskspacestepwidget.ui",
+        "remotelinuxcustomcommanddeploymentstep.cpp",
         "remotelinuxcustomcommanddeploymentstep.h",
         "remotelinuxcustomcommanddeployservice.cpp",
         "remotelinuxcustomcommanddeployservice.h",
@@ -75,7 +72,13 @@ QtcPlugin {
         "remotelinuxdeployconfigurationfactory.h",
         "remotelinuxdeployconfigurationwidget.cpp",
         "remotelinuxdeployconfigurationwidget.h",
+        "remotelinuxdeployconfigurationwidget.ui",
+        "remotelinuxdeploymentdatamodel.cpp",
+        "remotelinuxdeploymentdatamodel.h",
+        "remotelinuxenvironmentreader.cpp",
+        "remotelinuxenvironmentreader.h",
         "remotelinuxpackageinstaller.cpp",
+        "remotelinuxpackageinstaller.h",
         "remotelinuxplugin.cpp",
         "remotelinuxplugin.h",
         "remotelinuxrunconfiguration.cpp",
@@ -84,40 +87,21 @@ QtcPlugin {
         "remotelinuxrunconfigurationfactory.h",
         "remotelinuxrunconfigurationwidget.cpp",
         "remotelinuxrunconfigurationwidget.h",
+        "remotelinuxruncontrol.cpp",
         "remotelinuxruncontrol.h",
+        "remotelinuxruncontrolfactory.cpp",
+        "remotelinuxruncontrolfactory.h",
         "remotelinuxutils.cpp",
         "remotelinuxutils.h",
-        "tarpackagecreationstep.h",
-        "uploadandinstalltarpackagestep.h",
-        "genericdirectuploadservice.h",
-        "linuxdevicetestdialog.ui",
-        "packageuploader.cpp",
-        "packageuploader.h",
-        "profilesupdatedialog.cpp",
-        "profilesupdatedialog.h",
-        "profilesupdatedialog.ui",
-        "remotelinuxdeployconfigurationwidget.ui",
-        "remotelinuxenvironmentreader.cpp",
-        "remotelinuxenvironmentreader.h",
-        "remotelinuxpackageinstaller.h",
         "sshkeydeployer.cpp",
         "sshkeydeployer.h",
+        "tarpackagecreationstep.cpp",
+        "tarpackagecreationstep.h",
         "typespecificdeviceconfigurationlistmodel.cpp",
         "typespecificdeviceconfigurationlistmodel.h",
-        "abstractremotelinuxdeploystep.cpp",
-        "genericdirectuploadstep.cpp",
-        "remotelinuxcustomcommanddeploymentstep.cpp",
-        "remotelinuxruncontrol.cpp",
-        "remotelinuxruncontrolfactory.cpp",
-        "remotelinuxruncontrolfactory.h",
-        "tarpackagecreationstep.cpp",
         "uploadandinstalltarpackagestep.cpp",
-        "remotelinuxcheckforfreediskspaceservice.h",
-        "remotelinuxcheckforfreediskspaceservice.cpp",
-        "remotelinuxcheckforfreediskspacestep.h",
-        "remotelinuxcheckforfreediskspacestep.cpp",
-        "remotelinuxcheckforfreediskspacestepwidget.ui",
-        "images/embeddedtarget.png"
+        "uploadandinstalltarpackagestep.h",
+        "images/embeddedtarget.png",
     ]
 
     ProductModule {