From 86ff13b893f2e9435dc36410a8206db115adba3b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 27 Sep 2013 09:35:49 +0200
Subject: [PATCH] Fix compilation of the Android plugin with Qt 4.

Change-Id: I5f16e01754b84e024b33d9addee94352c69c8a25
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/android/androiddeployqtwidget.cpp | 2 +-
 src/plugins/android/certificatesmodel.cpp     | 2 ++
 src/plugins/android/certificatesmodel.h       | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp
index d6234b99329..d610d51b461 100644
--- a/src/plugins/android/androiddeployqtwidget.cpp
+++ b/src/plugins/android/androiddeployqtwidget.cpp
@@ -167,7 +167,7 @@ void AndroidDeployQtWidget::inputFileComboBoxIndexChanged()
 {
     if (m_ignoreChange)
         return;
-    QString text = m_ui->inputFileComboBox->currentData().toString();
+    QString text = m_ui->inputFileComboBox->itemData(m_ui->inputFileComboBox->currentIndex()).toString();
     m_step->setInputFile(text);
 }
 
diff --git a/src/plugins/android/certificatesmodel.cpp b/src/plugins/android/certificatesmodel.cpp
index c06d1b72d1a..e43b36008f8 100644
--- a/src/plugins/android/certificatesmodel.cpp
+++ b/src/plugins/android/certificatesmodel.cpp
@@ -30,6 +30,8 @@
 
 #include "certificatesmodel.h"
 
+#include <QComboBox>
+
 using namespace Android;
 using namespace Android::Internal;
 
diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h
index fa0d53c2192..f712433aa8f 100644
--- a/src/plugins/android/certificatesmodel.h
+++ b/src/plugins/android/certificatesmodel.h
@@ -32,6 +32,8 @@
 #define CERTIFICATESMODEL_H
 
 #include <QAbstractListModel>
+#include <QVector>
+#include <QPair>
 
 namespace Android {
 namespace Internal {