Commit 92e80090 authored by El Mehdi Fekari's avatar El Mehdi Fekari Committed by Mehdi Fekari
Browse files

Qnx: Generate bar descriptor when opening new projects



When opening a project the first time with Qt Creator
and selecting a BlackBerry kit, Qt Creator does not pop up
the dialog asking the user to add a bar descriptor. This
makes the deployment step useless since the bar descriptor
is mandatory for packaging.

The user has to close and reopen the project again in order
to be able to generate a bar-descriptor.

Change-Id: Ibb930e60d3b9d98ad9631caa092f6ec17b33b749
Reviewed-by: default avatarSergio Ahumada <sahumada@blackberry.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 0cb50a9b
......@@ -102,18 +102,28 @@ void BarDescriptorFileNodeManager::updateBarDescriptorNodes(ProjectExplorer::Tar
continue;
connect(bbdc->deploymentInfo(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(handleDeploymentInfoChanged()), Qt::UniqueConnection);
this, SLOT(handleDeploymentDataChanged()), Qt::UniqueConnection);
connect(bbdc->deploymentInfo(), SIGNAL(modelReset()),
this, SLOT(handleDeploymentInfoChanged()), Qt::UniqueConnection);
this, SLOT(handleDeploymentModelReset()), Qt::UniqueConnection);
}
}
void BarDescriptorFileNodeManager::handleDeploymentInfoChanged()
void BarDescriptorFileNodeManager::handleDeploymentDataChanged()
{
handleDeploymentInfoChanged(false);
}
void BarDescriptorFileNodeManager::handleDeploymentModelReset()
{
handleDeploymentInfoChanged(true);
}
void BarDescriptorFileNodeManager::handleDeploymentInfoChanged(bool modelReset)
{
BlackBerryDeployInformation *deployInfo = qobject_cast<BlackBerryDeployInformation*>(sender());
QTC_ASSERT(deployInfo, return);
updateBarDescriptorNodes(deployInfo->target()->project(), false);
updateBarDescriptorNodes(deployInfo->target()->project(), modelReset);
}
void BarDescriptorFileNodeManager::updateBarDescriptorNodes(ProjectExplorer::Project *project, bool attemptCreate)
......
......@@ -55,7 +55,10 @@ public:
private slots:
void setCurrentProject(ProjectExplorer::Project *project);
void updateBarDescriptorNodes(ProjectExplorer::Target *target);
void handleDeploymentInfoChanged();
void handleDeploymentInfoChanged(bool modelReset);
void handleDeploymentDataChanged();
void handleDeploymentModelReset();
private:
BarDescriptorFileNode *findBarDescriptorFileNode(ProjectExplorer::ProjectNode *parent) const;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment