diff options
| author | Pawel Polanski <pawel.3.polanski@nokia.com> | 2010-09-13 15:02:29 +0200 |
|---|---|---|
| committer | Pawel Polanski <pawel.3.polanski@nokia.com> | 2010-09-13 16:04:23 +0200 |
| commit | 8ea7389ca80d76cfae491c22c36cc6ec48314966 (patch) | |
| tree | 4bfa259367de9075b8871c48305c3c46aa1d2303 /src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | |
| parent | ee4f4003d506c41f89350d26bce7d9f9ec99afcb (diff) | |
| download | qt-creator-8ea7389ca80d76cfae491c22c36cc6ec48314966.tar.gz | |
Static libraries are not listed in the sis package list. Symbian OS
Revised-by: Tobias Hunger
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index bbb5e0b086..f3a4abb28a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -128,25 +128,23 @@ ProjectExplorer::DeployConfigurationWidget *S60DeployConfiguration::configuratio return new S60DeployConfigurationWidget(); } -QStringList S60DeployConfiguration::signedPackages() const +bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode) const { - QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); - QStringList result; - foreach (Qt4ProFileNode *node, list) { - TargetInformation ti = node->targetInformation(); - if (ti.valid) - result << ti.buildDir + QLatin1Char('/') + ti.target - + (runSmartInstaller() ? QLatin1String("_installer") : QLatin1String("")) - + QLatin1String(".sis"); + if (projectNode.projectType() == LibraryTemplate) { + const QStringList &config(projectNode.variableValue(ConfigVar)); + if (config.contains(QLatin1String("static")) || config.contains(QLatin1String("staticlib"))) + return true; } - return result; + return false; } -QStringList S60DeployConfiguration::appSignedPackages() const +QStringList S60DeployConfiguration::signedPackages() const { QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QStringList result; foreach (Qt4ProFileNode *node, list) { + if (isStaticLibrary(*node)) //no sis package + continue; TargetInformation ti = node->targetInformation(); if (ti.valid) result << ti.buildDir + QLatin1Char('/') + ti.target @@ -161,6 +159,8 @@ QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->leafProFiles(); QStringList result; foreach (Qt4ProFileNode *qt4ProFileNode, leafs) { + if (isStaticLibrary(*qt4ProFileNode)) //no sis package + continue; TargetInformation ti = qt4ProFileNode->targetInformation(); if (!ti.valid) continue; @@ -178,6 +178,8 @@ QStringList S60DeployConfiguration::packageTemplateFileNames() const QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QStringList result; foreach (Qt4ProFileNode *node, list) { + if (isStaticLibrary(*node)) //no sis package + continue; TargetInformation ti = node->targetInformation(); if (ti.valid) result << ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"); @@ -190,6 +192,8 @@ QStringList S60DeployConfiguration::appPackageTemplateFileNames() const QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QStringList result; foreach (Qt4ProFileNode *node, list) { + if (isStaticLibrary(*node)) //no sis package + continue; TargetInformation ti = node->targetInformation(); if (ti.valid) result << ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"); |