diff options
Diffstat (limited to 'src/plugins/android/androiddeployqtwidget.cpp')
| -rw-r--r-- | src/plugins/android/androiddeployqtwidget.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp index 8a46ebce5e..d7c4c3885b 100644 --- a/src/plugins/android/androiddeployqtwidget.cpp +++ b/src/plugins/android/androiddeployqtwidget.cpp @@ -38,9 +38,9 @@ #include "androidextralibrarylistmodel.h" #include <projectexplorer/target.h> -#include <qt4projectmanager/qt4buildconfiguration.h> -#include <qt4projectmanager/qt4project.h> -#include <qt4projectmanager/qt4nodes.h> +#include <qt4projectmanager/qmakebuildconfiguration.h> +#include <qt4projectmanager/qmakeproject.h> +#include <qt4projectmanager/qmakenodes.h> #include <QFileDialog> @@ -135,7 +135,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step) connect(m_ui->createAndroidManifestButton, SIGNAL(clicked()), this, SLOT(createManifestButton())); - m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()), + m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<QmakeProjectManager::Qt4Project *>(m_step->project()), this); m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel); @@ -156,8 +156,8 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget() void AndroidDeployQtWidget::checkProjectTemplate() { - Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()); - if (project->rootQt4ProjectNode()->projectType() == Qt4ProjectManager::ApplicationTemplate) + QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project()); + if (project->rootQt4ProjectNode()->projectType() == QmakeProjectManager::ApplicationTemplate) m_ui->additionalLibrariesGroupBox->setEnabled(true); else m_ui->additionalLibrariesGroupBox->setEnabled(false); @@ -171,9 +171,9 @@ void AndroidDeployQtWidget::createManifestButton() void AndroidDeployQtWidget::updateInputFileUi() { - Qt4ProjectManager::Qt4Project *project - = static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()); - QList<Qt4ProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles(); + QmakeProjectManager::Qt4Project *project + = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project()); + QList<QmakeProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles(); int size = nodes.size(); if (size == 0 || size == 1) { // there's nothing to select, e.g. before parsing @@ -185,8 +185,8 @@ void AndroidDeployQtWidget::updateInputFileUi() m_ui->inputFileComboBox->setVisible(true); m_ui->inputFileComboBox->clear(); - foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes) { - QString file = node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile); + foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes) { + QString file = node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile); m_ui->inputFileComboBox->addItem(node->displayName(), file); } @@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); updateSigningWarning(); - Qt4ProjectManager::Qt4BuildConfiguration *bc - = qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); + QmakeProjectManager::Qt4BuildConfiguration *bc + = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); m_currentBuildConfiguration = bc; if (bc) connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); @@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() void AndroidDeployQtWidget::updateSigningWarning() { - Qt4ProjectManager::Qt4BuildConfiguration *bc = qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); + QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild); if (m_step->signPackage() && debug) { m_ui->signingDebugWarningIcon->setVisible(true); |