diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-10-30 13:34:46 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-30 13:34:46 +0100 |
commit | 0ddb6cac29628425b7c2490a20df944f062ce50c (patch) | |
tree | 8527a12fbc6eb6d3fc7a8e4a30044f549bc2fd92 /src/plugins/qnx/blackberrydeployconfiguration.cpp | |
parent | bcd704d7bf5a1daa3d0ad9574386c11981c409a2 (diff) | |
parent | 88c647ce6868cd7ab03ec96062d2a77813b6e906 (diff) | |
download | qt-creator-0ddb6cac29628425b7c2490a20df944f062ce50c.tar.gz |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmakeprojectmanager/qmakeproject.cpp
Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
Diffstat (limited to 'src/plugins/qnx/blackberrydeployconfiguration.cpp')
-rw-r--r-- | src/plugins/qnx/blackberrydeployconfiguration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp index 64f3f8ceaa..f204572f1c 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp @@ -38,9 +38,9 @@ #include <projectexplorer/kitinformation.h> #include <projectexplorer/target.h> #include <projectexplorer/projectexplorer.h> -#include <qt4projectmanager/qmakenodes.h> -#include <qt4projectmanager/qmakeproject.h> -#include <qt4projectmanager/qmakebuildconfiguration.h> +#include <qmakeprojectmanager/qmakenodes.h> +#include <qmakeprojectmanager/qmakeproject.h> +#include <qmakeprojectmanager/qmakebuildconfiguration.h> #include <qtsupport/qtkitinformation.h> #include <coreplugin/icore.h> #include <ssh/sshconnection.h> @@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor() void BlackBerryDeployConfiguration::setupBarDescriptor() { - QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); + QmakeProjectManager::QmakeBuildConfiguration *bc = qobject_cast<QmakeProjectManager::QmakeBuildConfiguration *>(target()->activeBuildConfiguration()); if (!bc || !target()->kit()) return; @@ -90,8 +90,8 @@ void BlackBerryDeployConfiguration::setupBarDescriptor() QString projectName = target()->project()->displayName(); QString targetName; - QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(target()->project()); - foreach (QmakeProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) { + QmakeProjectManager::QmakeProject *project = static_cast<QmakeProjectManager::QmakeProject *>(target()->project()); + foreach (QmakeProjectManager::QmakeProFileNode *node, project->applicationProFiles()) { QString target = node->targetInformation().target; if (!target.isEmpty()) { targetName = target; |