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

Android: Pass BuildSystem to CreateAndroidManifectWizard

Browse Source 
Instead of a Target and hoping that its activeBuildystem is the
right one.

Change-Id: Ieb384d89e8f580b24205ce46a38f151aa72e2f6e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-02-13 14:03:37 +01:00
parent 7ba45c66ff
commit b18fceb15d
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/createandroidmanifestwizard.h
View File

@@ -41,7 +41,7 @@ namespace Utils {
class InfoLabel;
}
namespace ProjectExplorer { class Target; }
namespace ProjectExplorer { class BuildSystem; }
namespace Android {
@@ -92,7 +92,7 @@ class ANDROID_EXPORT CreateAndroidManifestWizard : public Utils::Wizard
{
Q_OBJECT
public:
CreateAndroidManifestWizard(ProjectExplorer::Target *target);
CreateAndroidManifestWizard(ProjectExplorer::BuildSystem *buildSystem);
QString buildKey() const;
void setBuildKey(const QString &buildKey);
@@ -103,7 +103,7 @@ public:
void setDirectory(const QString &directory);
void setCopyGradle(bool copy);
ProjectExplorer::Target *target() const;
ProjectExplorer::BuildSystem *buildSystem() const;
private:
enum CopyState {
@@ -115,7 +115,7 @@ private:
void createAndroidManifestFile();
void createAndroidTemplateFiles();
ProjectExplorer::Target *m_target;
ProjectExplorer::BuildSystem *m_buildSystem;
QString m_buildKey;
QString m_directory;
CopyState m_copyState;