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

Fix compilation of the Android plugin with Qt 4.

Browse Source 
Change-Id: I5f16e01754b84e024b33d9addee94352c69c8a25
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2013-09-27 09:35:49 +02:00
parent 372079d35f
commit 86ff13b893
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androiddeployqtwidget.cpp
View File

@@ -167,7 +167,7 @@ void AndroidDeployQtWidget::inputFileComboBoxIndexChanged()
{ {
if (m_ignoreChange) if (m_ignoreChange)
return; return;
QString text = m_ui->inputFileComboBox->currentData().toString(); QString text = m_ui->inputFileComboBox->itemData(m_ui->inputFileComboBox->currentIndex()).toString();
m_step->setInputFile(text); m_step->setInputFile(text);
} }

2
src/plugins/android/certificatesmodel.cpp
View File

@@ -30,6 +30,8 @@
#include "certificatesmodel.h" #include "certificatesmodel.h"
#include <QComboBox>
using namespace Android; using namespace Android;
using namespace Android::Internal; using namespace Android::Internal;

2
src/plugins/android/certificatesmodel.h
View File

@@ -32,6 +32,8 @@
#define CERTIFICATESMODEL_H #define CERTIFICATESMODEL_H
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QVector>
#include <QPair>
namespace Android { namespace Android {
namespace Internal { namespace Internal {