summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidsettingswidget.h
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-01-25 16:49:22 +0100
committerDaniel Teske <daniel.teske@digia.com>2013-02-07 19:21:20 +0100
commit4a890f6d4718073ec13b264ffb037a6f0fb984a7 (patch)
tree6d76d4ffbb6fcbf76d62157dd510eef9c195f031 /src/plugins/android/androidsettingswidget.h
parent66fefcd14ccec97a4670eb9ec73dc29ed72ade33 (diff)
downloadqt-creator-4a890f6d4718073ec13b264ffb037a6f0fb984a7.tar.gz
Simplify Android settings, move debugger/gdbserver to Kit
Creator now realiable creates one toolchain for each toolchain found in the ndk. This no longer depends on any qt versions being present. Also the gdb command and gdb server command are moved to the Kit and are no longer found in the Android Options page. Both settings can be autodetected from the Kit options page. Note that this might break existing android kits. Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.h')
-rw-r--r--src/plugins/android/androidsettingswidget.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h
index ec7cd458fa..49a75f9196 100644
--- a/src/plugins/android/androidsettingswidget.h
+++ b/src/plugins/android/androidsettingswidget.h
@@ -76,20 +76,11 @@ private slots:
void sdkLocationEditingFinished();
void ndkLocationEditingFinished();
void antLocationEditingFinished();
- void gdbLocationEditingFinished();
- void gdbserverLocationEditingFinished();
- void gdbLocationX86EditingFinished();
- void gdbserverLocationX86EditingFinished();
void openJDKLocationEditingFinished();
void browseSDKLocation();
void browseNDKLocation();
void browseAntLocation();
- void browseGdbLocation();
- void browseGdbserverLocation();
- void browseGdbLocationX86();
- void browseGdbserverLocationX86();
void browseOpenJDKLocation();
- void toolchainVersionIndexChanged(QString);
void addAVD();
void removeAVD();
void startAVD();
@@ -101,7 +92,6 @@ private:
void initGui();
bool checkSDK(const Utils::FileName &location);
bool checkNDK(const Utils::FileName &location);
- void fillToolchainVersions();
Ui_AndroidSettingsWidget *m_ui;
AndroidConfig m_androidConfig;