summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidpackagecreationstep.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-10-16 11:02:37 +0200
committerEike Ziller <eike.ziller@digia.com>2013-10-16 12:09:59 +0200
commitebcd992577bfca1e94f207958d736490395cd82b (patch)
tree2bba49115790e80fef7e57006d3acc47cfcecf95 /src/plugins/android/androidpackagecreationstep.cpp
parent56d564c5b318ff57ee02dbf3de6ca1a22b0231ca (diff)
downloadqt-creator-ebcd992577bfca1e94f207958d736490395cd82b.tar.gz
Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/android/androidpackagecreationstep.cpp')
-rw-r--r--src/plugins/android/androidpackagecreationstep.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index b405012e62..7b14cb38aa 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -72,7 +72,7 @@ namespace {
const QLatin1String CertificateSeparator("*******************************************");
}
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
AndroidPackageCreationStep::AndroidPackageCreationStep(BuildStepList *bsl)
: BuildStep(bsl, CreatePackageId)
@@ -109,7 +109,7 @@ bool AndroidPackageCreationStep::init()
// Copying
m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir;
- QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+ QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
if (androidTargetArch.isEmpty()) {
raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec."));
return false;
@@ -435,7 +435,7 @@ void AndroidPackageCreationStep::collectFiles(QList<DeployItem> *deployList,
return;
Qt4Project *project = static_cast<Qt4Project *>(target()->project());
- QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+ QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
QString androidAssetsPath = m_androidDir.toString() + QLatin1String("/assets/");
QString androidJarPath = m_androidDir.toString() + QLatin1String("/libs/");
@@ -882,4 +882,4 @@ void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android