diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-03-12 15:20:39 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-03-13 12:31:02 +0100 |
| commit | e060086f5a19d6f0a0ffd85004c4c64758aef4a0 (patch) | |
| tree | 3bf4af28c55cd8ff56aad9ff46531887d96627a9 /src/plugins/android/createandroidmanifestwizard.h | |
| parent | 1f15995bca101800c88354a8d94b8245ce43fc40 (diff) | |
Android: Don't let the user choose a stupid ANDROID_PACKAGE_SOURCE_DIR
On creating a AndroidManifest.xml we ask the user where to put the file,
which as a sideeffect also sets ANDROID_PACKAGE_DIR.
Since we copy everthing from ANDROID_PACKAGE_SOURCE_DIR into the build
directory, using the project's source directory is not desireable.
We now show a big error if the user tries that.
Task-number: QTCREATORBUG-11708
Change-Id: I7fade3efac0b7466cad8e83a92c2115d0a70c683
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/android/createandroidmanifestwizard.h')
| -rw-r--r-- | src/plugins/android/createandroidmanifestwizard.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/android/createandroidmanifestwizard.h b/src/plugins/android/createandroidmanifestwizard.h index a92c610e6f4..8cb8c95b7f1 100644 --- a/src/plugins/android/createandroidmanifestwizard.h +++ b/src/plugins/android/createandroidmanifestwizard.h @@ -34,6 +34,7 @@ QT_BEGIN_NAMESPACE class QComboBox; +class QLabel; QT_END_NAMESPACE namespace ProjectExplorer { class Target; } @@ -70,9 +71,16 @@ class ChooseDirectoryPage : public QWizardPage Q_OBJECT public: ChooseDirectoryPage(CreateAndroidManifestWizard *wizard); +protected: + bool isComplete() const; +private slots: + void checkPackageSourceDir(); private: CreateAndroidManifestWizard *m_wizard; Utils::PathChooser *m_androidPackageSourceDir; + QLabel *m_sourceDirectoryWarning; + QLabel *m_warningIcon; + bool m_complete; }; class CreateAndroidManifestWizard : public Utils::Wizard |