summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/blackberrydeployinformation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qnx/blackberrydeployinformation.cpp')
-rw-r--r--src/plugins/qnx/blackberrydeployinformation.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp
index b02a44fc1a..a7f2684e2b 100644
--- a/src/plugins/qnx/blackberrydeployinformation.cpp
+++ b/src/plugins/qnx/blackberrydeployinformation.cpp
@@ -34,8 +34,8 @@
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h>
-#include <qt4projectmanager/qmakeproject.h>
-#include <qt4projectmanager/qmakenodes.h>
+#include <qmakeprojectmanager/qmakeproject.h>
+#include <qmakeprojectmanager/qmakenodes.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
@@ -241,8 +241,8 @@ void BlackBerryDeployInformation::updateModel()
beginResetModel();
QList<BarPackageDeployInformation> keep;
- QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
- foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes) {
+ QList<QmakeProjectManager::QmakeProFileNode *> appNodes = project()->applicationProFiles();
+ foreach (QmakeProjectManager::QmakeProFileNode *node, appNodes) {
bool nodeFound = false;
for (int i = 0; i < m_deployInformation.size(); ++i) {
if (m_deployInformation[i].proFilePath == node->path()
@@ -264,9 +264,9 @@ void BlackBerryDeployInformation::updateModel()
endResetModel();
}
-QmakeProjectManager::Qt4Project *BlackBerryDeployInformation::project() const
+QmakeProjectManager::QmakeProject *BlackBerryDeployInformation::project() const
{
- return static_cast<QmakeProjectManager::Qt4Project *>(m_target->project());
+ return static_cast<QmakeProjectManager::QmakeProject *>(m_target->project());
}
void BlackBerryDeployInformation::initModel()
@@ -282,7 +282,7 @@ void BlackBerryDeployInformation::initModel()
return;
}
- const QmakeProjectManager::Qt4ProFileNode *const rootNode = project()->rootQt4ProjectNode();
+ const QmakeProjectManager::QmakeProFileNode *const rootNode = project()->rootQmakeProjectNode();
if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return;
@@ -291,15 +291,15 @@ void BlackBerryDeployInformation::initModel()
beginResetModel();
m_deployInformation.clear();
- QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
- foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes)
+ QList<QmakeProjectManager::QmakeProFileNode *> appNodes = project()->applicationProFiles();
+ foreach (QmakeProjectManager::QmakeProFileNode *node, appNodes)
m_deployInformation << deployInformationFromNode(node);
endResetModel();
connect(project(), SIGNAL(proFilesEvaluated()), this, SLOT(updateModel()));
}
-BarPackageDeployInformation BlackBerryDeployInformation::deployInformationFromNode(QmakeProjectManager::Qt4ProFileNode *node) const
+BarPackageDeployInformation BlackBerryDeployInformation::deployInformationFromNode(QmakeProjectManager::QmakeProFileNode *node) const
{
QmakeProjectManager::TargetInformation ti = node->targetInformation();