feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BlackBerry: Do not add bar-descriptor.xml to .pro file

Browse Source 
The bar-descriptor.xml file will no longer be added to the .pro
file as OTHER_FILES, as it was not necessarily the file listed in
the .pro file that was used for creating the package later on,
as that is configured in the deployment settings.

Instead, the file configured in the deployment settings is now
added to the file project tree, and kept in sync if the user
changes the file to use for deployment.

Task-number: QTCREATORBUG-10054
Change-Id: I3068fedf8ea17f4e60131f9106b3844086d1552b
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
Tobias Nätterlund
2014-03-06 14:39:50 +01:00
committed by Tobias Nätterlund
parent 3b786e7faf
commit 8ee451b94a
11 changed files with 502 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxplugin.cpp
View File

@@ -59,6 +59,7 @@
#include "qnxtoolchain.h"
#include "qnxattachdebugsupport.h"
#include "blackberrypotentialkit.h"
#include "bardescriptorfilenodemanager.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -106,6 +107,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
addAutoReleasedObject(new BlackBerryCheckDeviceStatusStepFactory);
addAutoReleasedObject(new CascadesImportWizard);
addAutoReleasedObject(new BlackBerryPotentialKit);
addAutoReleasedObject(new BarDescriptorFileNodeManager);
BlackBerryDeviceConnectionManager::instance()->initialize();
// Handles QNX