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

Fix Add Library for static libraries

Browse Source 
Broke in 7481bff2b4 which split up
LibraryTemplate in SharedLibraryTemplate and StaticLibrary.

Change-Id: I797c007fff09ffd09b7744cf3543217b936dea12
Task-number: QTCREATORBUG-14382
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2015-05-04 11:25:38 +02:00
parent f97069ebb2
commit e7d6ea6ad3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
View File

@@ -1048,7 +1048,8 @@ void InternalLibraryDetailsController::updateProFile()
QList<QmakeProFileNode *> proFiles = findQt4ProFiles(rootProject); QList<QmakeProFileNode *> proFiles = findQt4ProFiles(rootProject);
foreach (QmakeProFileNode *proFileNode, proFiles) { foreach (QmakeProFileNode *proFileNode, proFiles) {
const QString proFilePath = proFileNode->path().toString(); const QString proFilePath = proFileNode->path().toString();
if (proFileNode->projectType() == SharedLibraryTemplate) { QmakeProjectManager::QmakeProjectType type = proFileNode->projectType();
if (type == SharedLibraryTemplate || type == StaticLibraryTemplate) {
const QStringList configVar = proFileNode->variableValue(ConfigVar); const QStringList configVar = proFileNode->variableValue(ConfigVar);
if (!configVar.contains(QLatin1String("plugin"))) { if (!configVar.contains(QLatin1String("plugin"))) {
const QString relProFilePath = rootDir.relativeFilePath(proFilePath); const QString relProFilePath = rootDir.relativeFilePath(proFilePath);