diff options
| author | hjk <hjk@qt.io> | 2019-01-24 17:27:50 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-01-25 13:09:06 +0000 |
| commit | ee483abdb6fcec31d3a3da944cca410e291d8e56 (patch) | |
| tree | c4cd7b2702f2ee2940b9e88d7a48bdf77108d60d /src/plugins/android/androidmanager.cpp | |
| parent | 678112c6fd76afa68216845c4e8dc86708050e63 (diff) | |
Android: Remove DeployConfiguration restriction
... to matching Qt and tool chain.
This is the only remaining place in Creator that refuses to restore
deploy configurations in such cases, and arguably there's no point
in dropping such a configuration as a whole, the individual steps
(i.e. AndroidDeployQtStep) can and do chicken out at deploy time
if there's no Qt version in reach.
Also move AndroidDeployConfigurationFactory to the plugin.cpp,
no need for a .cpp/.h pair for the remaining few lines.
Change-Id: If6ea7cf9573149c88c05629997ac582dc90d1e48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index d5cfd9146e6..c31302f1143 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -27,7 +27,6 @@ #include "androidbuildapkstep.h" #include "androidconstants.h" -#include "androiddeployconfiguration.h" #include "androidconfigurations.h" #include "androidrunconfiguration.h" #include "androidglobal.h" |