diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-08-28 15:20:54 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-08-28 16:05:35 +0200 |
| commit | 307aa7b3aa0b684d154e8b4ef2769e4470bebed2 (patch) | |
| tree | 889c878d0db3cb0f3161fe2d11ef2df64ce2febb /src/plugins/android/androidpackagecreationwidget.cpp | |
| parent | 1fee440e726cd56b42a1df36cd2fc9d8fcbbadf2 (diff) | |
| download | qt-creator-307aa7b3aa0b684d154e8b4ef2769e4470bebed2.tar.gz | |
Rename AndroidManager::targetSDK to buildTargetSDK
There are 3 different sdk settings:
- The minimum sdk setting from the AndroidManifest.xml
- The target sdk setting from the AndroidManifest.xml
- The target sdk setting from the project.properties file
The last one is now called buildTargetSDK, since it only affects the
build.
Change-Id: I373d925a45088ff0cf8a8e0b22cf9744e571eeb1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/android/androidpackagecreationwidget.cpp')
| -rw-r--r-- | src/plugins/android/androidpackagecreationwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidpackagecreationwidget.cpp b/src/plugins/android/androidpackagecreationwidget.cpp index 5bb2876955..cb3ae16da1 100644 --- a/src/plugins/android/androidpackagecreationwidget.cpp +++ b/src/plugins/android/androidpackagecreationwidget.cpp @@ -198,7 +198,7 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo() QStringList targets = AndroidConfigurations::instance().sdkTargets(minApiLevel); m_ui->targetSDKComboBox->addItems(targets); - m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::targetSDK(target))); + m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(target))); m_qtLibsModel->setAvailableItems(AndroidManager::availableQtLibs(target)); m_qtLibsModel->setCheckedItems(AndroidManager::qtLibs(target)); @@ -208,7 +208,7 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo() void AndroidPackageCreationWidget::setTargetSDK(const QString &sdk) { - AndroidManager::setTargetSDK(m_step->target(), sdk); + AndroidManager::setBuildTargetSDK(m_step->target(), sdk); Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); if (!bc) return; |