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

Symbian: Skip the subdir projects while creating sis packages

Browse Source
This commit is contained in:
Pawel Polanski
2011-03-15 10:24:25 +01:00
parent f3427d5494
commit aa35085ca3
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/codagdbadapter.cpp
View File

@@ -1033,8 +1033,8 @@ void CodaGdbAdapter::startAdapter()
} else {
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()
->getCodaDevice(parameters.remoteChannel);
bool ok = m_codaDevice && m_codaDevice->device()->isOpen();
bool ok = !m_codaDevice.isNull() && m_codaDevice->device()->isOpen();
if (!ok) {
QString msg = QString("Couldn't open serial device %1")
.arg(parameters.remoteChannel);

8
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
View File

@@ -118,9 +118,11 @@ bool CodaRunControl::setupLauncher()
// We get the port from SymbianDeviceManager
appendMessage(tr("Connecting to '%1'...").arg(m_serialPort), NormalMessageFormat);
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()->getCodaDevice(m_serialPort);
bool ok = m_codaDevice && m_codaDevice->device()->isOpen();
if (!ok) {
if (m_codaDevice.isNull()) {
appendMessage(tr("Unable to create CODA connection. Please try again."), ErrorMessageFormat);
return false;
}
if (!m_codaDevice->device()->isOpen()) {
appendMessage(tr("Could not open serial device: %1").arg(m_codaDevice->device()->errorString()), ErrorMessageFormat);
return false;
}

16
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View File

@@ -148,12 +148,20 @@ bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode)
return false;
}
bool S60DeployConfiguration::hasSisPackage(const Qt4ProFileNode &projectNode) const
{
if (projectNode.projectType() != ApplicationTemplate
&& projectNode.projectType() != LibraryTemplate)
return false;
return !isStaticLibrary(projectNode);
}
QStringList S60DeployConfiguration::signedPackages() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
if (!hasSisPackage(*node))
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
@@ -176,7 +184,7 @@ QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *qt4ProFileNode, leafs) {
if (isStaticLibrary(*qt4ProFileNode)) //no sis package
if (!hasSisPackage(*qt4ProFileNode))
continue;
TargetInformation ti = qt4ProFileNode->targetInformation();
if (!ti.valid)
@@ -195,7 +203,7 @@ QStringList S60DeployConfiguration::packageTemplateFileNames() const
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
if (!hasSisPackage(*node))
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)
@@ -209,7 +217,7 @@ QStringList S60DeployConfiguration::appPackageTemplateFileNames() const
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
if (!hasSisPackage(*node))
continue;
TargetInformation ti = node->targetInformation();
if (ti.valid)

1
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
View File

@@ -131,6 +131,7 @@ private:
QString createPackageName(const QString &baseName) const;
bool isDebug() const;
bool isStaticLibrary(const Qt4ProFileNode &projectNode) const;
bool hasSisPackage(const Qt4ProFileNode &projectNode) const;
private:
ProjectExplorer::BuildConfiguration *m_activeBuildConfiguration;

4
src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
View File

@@ -555,6 +555,10 @@ void S60DeployConfigurationWidget::updateDeviceInfo()
} else if (m_deployConfiguration->communicationChannel() == S60DeployConfiguration::CommunicationCodaSerialConnection) {
const SymbianUtils::SymbianDevice commDev = currentDevice();
m_codaInfoDevice = SymbianUtils::SymbianDeviceManager::instance()->getCodaDevice(commDev.portName());
if (m_codaInfoDevice.isNull()) {
setDeviceInfoLabel(tr("Unable to create CODA connection. Please try again."), true);
return;
}
if (!m_codaInfoDevice->device()->isOpen()) {
setDeviceInfoLabel(m_codaInfoDevice->device()->errorString(), true);
return;