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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
This commit is contained in:
Eike Ziller
2015-08-04 13:15:51 +02:00
parent b1401173de aa8998cfb3
commit cd5f9f6ff8
203 changed files with 6590 additions and 12601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddevicedialog.cpp
View File

@@ -109,6 +109,7 @@ private:
class AndroidDeviceModelDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
AndroidDeviceModelDelegate(QObject * parent = 0)
: QStyledItemDelegate(parent)
@@ -239,6 +240,7 @@ public:
class AndroidDeviceModel : public QAbstractItemModel
{
Q_OBJECT
public:
AndroidDeviceModel(int apiLevel, const QString &abi, AndroidConfigurations::Options options);
QModelIndex index(int row, int column,
@@ -663,3 +665,5 @@ void AndroidDeviceDialog::defaultDeviceClear()
m_ui->lookingForDeviceCancel->setVisible(false);
m_defaultDevice.clear();
}
#include "androiddevicedialog.moc"

4
src/plugins/android/androidqtsupport.cpp
View File

@@ -48,9 +48,9 @@ Utils::FileName Android::AndroidQtSupport::apkPath(ProjectExplorer::Target *targ
QString apkPath;
if (buildApkStep->useGradle())
apkPath = QLatin1String("/build/outputs/apk/android-build-");
apkPath = QLatin1String("build/outputs/apk/android-build-");
else
apkPath = QLatin1String("/bin/QtApp-");
apkPath = QLatin1String("bin/QtApp-");
if (buildApkStep->signPackage())
apkPath += QLatin1String("release.apk");
else