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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
This commit is contained in:
Eike Ziller
2014-07-17 12:42:04 +02:00
parent 98a88b0b84 0c00f44a2d
commit e7ea94b688
143 changed files with 1202 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidconfigurations.cpp
View File

@@ -620,8 +620,13 @@ QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices() const
line = QLatin1String(avds[i]);
if (line.contains(QLatin1String("---------")))
break;
if (line.contains(QLatin1String("Target:")))
dev.sdk = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).toInt();
if (line.contains(QLatin1String("Target:"))) {
QString tmp = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).trimmed();
if (tmp == QLatin1String("L")) // HACK for android-L preview
dev.sdk = 20;
else
dev.sdk = tmp.toInt();
}
if (line.contains(QLatin1String("Tag/ABI:")))
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char('/')) +1);
else if (line.contains(QLatin1String("ABI:")))

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

@@ -793,8 +793,10 @@ QString AndroidManager::androidNameForApiLevel(int x)
return QLatin1String("Android 4.3");
case 19:
return QLatin1String("Android 4.4");
case 20:
return QLatin1String("Android L"); // prelimary name?
default:
return tr("Unknown Android version.");
return tr("Unknown Android version. API Level: %1").arg(QString::number(x));
}
}

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

@@ -70,6 +70,8 @@
#include <QTimer>
#include <QCheckBox>
#include <limits>
using namespace ProjectExplorer;
using namespace Android;
using namespace Android::Internal;
@@ -180,7 +182,7 @@ void AndroidManifestEditorWidget::initializePage()
m_versionCode = new QSpinBox(packageGroupBox);
m_versionCode->setMaximum(99);
m_versionCode->setMaximum(std::numeric_limits<int>::max());
m_versionCode->setValue(1);
m_versionCode->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
formLayout->addRow(tr("Version code:"), m_versionCode);

3
src/plugins/android/androidpotentialkit.cpp
View File

@@ -120,7 +120,8 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
void AndroidPotentialKitWidget::openOptions()
{
Core::ICore::showOptionsDialog(Constants::ANDROID_SETTINGS_CATEGORY,
Constants::ANDROID_SETTINGS_ID);
Constants::ANDROID_SETTINGS_ID,
this);
}
void AndroidPotentialKitWidget::recheck()